Honor CFLAGS and LDFLAGS. This time 'make instal' with PKG_DEVELOPER=yes and PKG_USE_RELRO=yes completed successfully.

[ap98nb26u <ap98nb26u%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ap98nb26u <ap98nb26u%gmail.com@localhost>
Pushed By:	keiki
Date:		Mon Jan 1 14:30:56 2018 +0900
Changeset:	c4dbc8633465386a973800faa190ae0a7d7468f5

Modified Files:
	kbuild/Makefile
	kbuild/distinfo

Log Message:
Honor CFLAGS and LDFLAGS.
This time 'make instal' with PKG_DEVELOPER=yes and PKG_USE_RELRO=yes completed
successfully.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c4dbc8633465386a973800faa190ae0a7d7468f5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kbuild/Makefile | 16 ++++++++++++++--
 kbuild/distinfo |  8 ++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs:
diff --git a/kbuild/Makefile b/kbuild/Makefile
index 2876f35b65..4d7c92fc99 100644
--- a/kbuild/Makefile
+++ b/kbuild/Makefile
@@ -30,8 +30,20 @@ INSTALL_ENV+=	KBUILD_VERBOSE=2
 MAKE_ENV+=	KBUILD_LIB_SEARCH_PATHS="/lib /usr/lib ${X11BASE}/lib ${PREFIX}/lib"
 
 LDFLAGS+=	-lutil
-MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+# honor CFLAGS and LDFLAGS
+MAKE_ENV+=	TEMPLATE_BIN-KMK_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=	TEMPLATE_BIN-KMK_LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+=	TEMPLATE_BIN_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=	TEMPLATE_BIN_LDFLAGS=${LDFLAGS:Q}
+
+INSTALL_ENV+=	TEMPLATE_BIN_CFLAGS=${CFLAGS:Q}
+INSTALL_ENV+=	TEMPLATE_BIN_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=	TEMPLATE_BIN-THREADED_CFLAGS=${CFLAGS:Q}
+INSTALL_ENV+=	TEMPLATE_BIN-THREADED_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=	kObjCache_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=	kDepPre_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=	kmk_sed_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=	kmk_time_LDFLAGS=${LDFLAGS:Q}
 
 .PHONY: fetch-with-svn
 fetch-with-svn:
diff --git a/kbuild/distinfo b/kbuild/distinfo
index 7ca36f8467..5a4df0f227 100644
--- a/kbuild/distinfo
+++ b/kbuild/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.1 2016/07/08 09:42:53 kamil Exp $
 
-SHA1 (kBuild-r3127.tar.gz) = 1f2d383c504a7881a2ef71b1470c2422b773316d
-RMD160 (kBuild-r3127.tar.gz) = aea4428954871e44ebb4ccb7bf1f4facc91a92a6
-SHA512 (kBuild-r3127.tar.gz) = 6a724892d32c25a08dede7969d3878dea2c18f47da30908b147451e36297f77fdb806c34c457524010d3eadf199858843a92ca4cef774a0b8a700471708cb36c
-Size (kBuild-r3127.tar.gz) = 17579258 bytes
+SHA1 (kBuild-r3127.tar.gz) = 28417f588c0297c128372ad034112a89187a3e6e
+RMD160 (kBuild-r3127.tar.gz) = 753115612e4fa1c50cd674fd525e1f74bd7f9d4e
+SHA512 (kBuild-r3127.tar.gz) = c345020565b93ab4670037247fff6ed452faf6cf57c28301b5edb205faa5dc80268509182552d8aa58dbd34ec1cfb9394c9dcdc2707b5ea08341df2e834a93a2
+Size (kBuild-r3127.tar.gz) = 17644129 bytes
 SHA1 (patch-kBuild_header.kmk) = bcba91ea5f4ae200087aa0adf4632b461661ed26
 SHA1 (patch-src_kmk_Makefile.kmk) = 7647322e79030bf794caa900feaf5dbe293a2247
 SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = de8a40b3a454abaf82b3384f0c44dd98794d0267