diff options
| author | schmonz <schmonz@pkgsrc.org> | 2005-03-13 03:25:43 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2005-03-13 03:25:43 +0000 |
| commit | 21af779684ab743761eeae55e7049899c55a63d8 (patch) | |
| tree | e13c428ca94c0db7b6e70497630f99e207d41522 /net | |
| parent | 123caa2220b7dc3083a857ce8ee74447e7d76f93 (diff) | |
| download | pkgsrc-21af779684ab743761eeae55e7049899c55a63d8.tar.gz | |
In packages with djb-style compile scripts, properly enquote ${CC}
and ${CFLAGS}. This fixes the build of net/djbdns, as well as any
other of these packages passing down PKG_SYSCONFDIR via CFLAGS, as
well as being more generally correct for arbitrary user-defined
CFLAGS. Suggested by jlam.
For consistency across djbware in pkgsrc:
* In math/djbfft's and sysutils/daemontools's do-configure targets,
remove leading @ from ${ECHO} lines; from the former, also remove
unneeded single quotes from one such line.
* Rename net/publicfile's pre-build and sysutils/service-config's
post-patch targets to do-configure.
* In sysutils/checkpassword's do-configure target, reorder creation
of conf-cc, conf-ld, and conf-home.
All of the affected packages have been verified to compile.
XXX These packages probably have enough build goo in common to
XXX warrant an mk/djbware.mk. I'll investigate this post-freeze.
Diffstat (limited to 'net')
| -rw-r--r-- | net/djbdns/Makefile | 6 | ||||
| -rw-r--r-- | net/publicfile/Makefile | 8 | ||||
| -rw-r--r-- | net/ucspi-tcp/Makefile | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index 7ea6441d621..7db19e58214 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/03/07 09:41:45 uebayasi Exp $ +# $NetBSD: Makefile,v 1.38 2005/03/13 03:25:44 schmonz Exp $ # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp # @@ -50,8 +50,8 @@ CFLAGS+= --include errno.h .include "options.mk" do-configure: - ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld + ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc + ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home post-install: diff --git a/net/publicfile/Makefile b/net/publicfile/Makefile index 81ce30fd666..3c85af07aea 100644 --- a/net/publicfile/Makefile +++ b/net/publicfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/12/03 15:15:06 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/03/13 03:25:44 schmonz Exp $ # DISTNAME= publicfile-0.52 @@ -19,9 +19,9 @@ RESTRICTED= "unsure of djb's license" NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -pre-build: - ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld +do-configure: + ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc + ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld ${ECHO} ${PREFIX}/publicfile > ${WRKSRC}/conf-home .include "../../mk/bsd.pkg.mk" diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile index 236c0460612..da37910ec8b 100644 --- a/net/ucspi-tcp/Makefile +++ b/net/ucspi-tcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/12/03 15:15:06 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/03/13 03:25:44 schmonz Exp $ # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp DISTNAME= ucspi-tcp-0.88 @@ -31,8 +31,8 @@ GCC_REQD+= 3.0 INSTALLATION_DIRS= bin man man/man1 do-configure: - ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld + ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc + ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home post-install: |