bosh/pbosh: Honor CPPFLAGS, CFLAGS and LDFLAGS

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Oct 4 13:06:48 2018 +0200
Changeset:	dfd37c1dea9ce7a32bb5045931c46a158bb40a6d

Modified Files:
	bosh/Makefile
	pbosh/Makefile

Log Message:
bosh/pbosh: Honor CPPFLAGS, CFLAGS and LDFLAGS

This fixes the RELRO related pkglint errors.

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

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

diffstat:
 bosh/Makefile  | 11 +++++++----
 pbosh/Makefile |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs:
diff --git a/bosh/Makefile b/bosh/Makefile
index a57bc175bd..f0cdebaac4 100644
--- a/bosh/Makefile
+++ b/bosh/Makefile
@@ -16,6 +16,9 @@ MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	tbl
 TOOL_DEPENDS+=	smake-[0-9]*:../../wip/smake
 SMAKE=		MAKEFLAGS= smake
+MAKE_FLAGS+=	DESTDIR=${DESTDIR:Q} INS_BASE=${PREFIX:Q} DEFMANBASE=. MANDIR=${PKGMANDIR:Q}
+# Honor CPPFLAGS, CFLAGS and LDFLAGS
+MAKE_FLAGS+=	CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
 
 PKG_SHELL=	bin/bosh
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -26,15 +29,15 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .include "../../wip/smake/Makefile.common"
 
 do-configure:
-	cd ${WRKSRC}/inc && ${SMAKE}
+	cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
 
 do-build:
 	cd ${WRKSRC} && for library in					\
 		libschily libxtermcap libfind libgetopt libshedit;	\
 	do								\
-		cd ${WRKSRC}/$${library} && ${SMAKE};			\
+		cd ${WRKSRC}/$${library} && ${SMAKE} ${MAKE_FLAGS};	\
 	done
-	cd ${WRKSRC}/sh && ${SMAKE}
+	cd ${WRKSRC}/sh && ${SMAKE} ${MAKE_FLAGS}
 
 # Process tables in manpage
 post-build:
@@ -43,7 +46,7 @@ post-build:
 
 do-test:
 	cd ${WRKSRC}/sh &&						\
-		cd tests; ${SMAKE} tests
+		cd tests; ${SMAKE} ${MAKE_FLAGS} tests
 
 do-install:
 	cd ${WRKSRC}/sh &&						\
diff --git a/pbosh/Makefile b/pbosh/Makefile
index 31965943bf..875de9e09c 100644
--- a/pbosh/Makefile
+++ b/pbosh/Makefile
@@ -16,6 +16,9 @@ MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	tbl
 TOOL_DEPENDS+=	smake-[0-9]*:../../wip/smake
 SMAKE=		MAKEFLAGS= smake
+MAKE_FLAGS+=	DESTDIR=${DESTDIR:Q} INS_BASE=${PREFIX:Q} DEFMANBASE=. MANDIR=${PKGMANDIR:Q}
+# Honor CPPFLAGS, CFLAGS and LDFLAGS
+MAKE_FLAGS+=	CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
 
 PKG_SHELL=	bin/bosh
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -26,15 +29,15 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .include "../../wip/smake/Makefile.common"
 
 do-configure:
-	cd ${WRKSRC}/inc && ${SMAKE}
+	cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
 
 do-build:
 	cd ${WRKSRC} && for library in					\
 		libschily libxtermcap libfind libgetopt libshedit;	\
 	do								\
-		cd ${WRKSRC}/$${library} && ${SMAKE};			\
+		cd ${WRKSRC}/$${library} && ${SMAKE}  ${MAKE_FLAGS};	\
 	done
-	cd ${WRKSRC}/pbosh && ${SMAKE}
+	cd ${WRKSRC}/pbosh && ${SMAKE} ${MAKE_FLAGS}
 
 # Process tables in manpage
 post-build: