diff options
| author | tv <tv@pkgsrc.org> | 2005-04-21 15:53:53 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-04-21 15:53:53 +0000 |
| commit | ccf0e6df929d353b360c0a0895d9fc86dceeabe6 (patch) | |
| tree | ce98459950bac6abcaea5b0eec6c1dc9822a1d39 | |
| parent | c41906963c6ffbe0362bb91813b5654354e593f9 (diff) | |
| download | pkgsrc-ccf0e6df929d353b360c0a0895d9fc86dceeabe6.tar.gz | |
Work around brain damaged autoconf by stripping leading and trailing
whitespace from *FLAGS and LIBS before doing :Q quoting.
Should fix PR pkg/29945.
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e209a0f2d16..8ab51779490 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1614 2005/04/18 10:06:47 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1615 2005/04/21 15:53:53 tv Exp $ # # This file is in the public domain. # @@ -291,14 +291,14 @@ ${_var_}+= ${${_var_}.*} CPPFLAGS+= ${CPP_PRECOMP_FLAGS} ALL_ENV+= CC=${CC:Q} -ALL_ENV+= CFLAGS=${CFLAGS:Q} -ALL_ENV+= CPPFLAGS=${CPPFLAGS:Q} -ALL_ENV+= CXX=${CXX:Q} -ALL_ENV+= CXXFLAGS=${CXXFLAGS:Q} +ALL_ENV+= CFLAGS=${CFLAGS:C/^ *//:C/ *$//:Q} +ALL_ENV+= CPPFLAGS=${CPPFLAGS:C/^ *//:C/ *$//:Q} +ALL_ENV+= CXX=${CXX:C/^ *//:C/ *$//:Q} +ALL_ENV+= CXXFLAGS=${CXXFLAGS:C/^ *//:C/ *$//:Q} ALL_ENV+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q} ALL_ENV+= F77=${FC:Q} ALL_ENV+= FC=${FC:Q} -ALL_ENV+= FFLAGS=${FFLAGS:Q} +ALL_ENV+= FFLAGS=${FFLAGS:C/^ *//:C/ *$//:Q} ALL_ENV+= LANG=C ALL_ENV+= LC_COLLATE=C ALL_ENV+= LC_CTYPE=C @@ -306,7 +306,7 @@ ALL_ENV+= LC_MESSAGES=C ALL_ENV+= LC_MONETARY=C ALL_ENV+= LC_NUMERIC=C ALL_ENV+= LC_TIME=C -ALL_ENV+= LDFLAGS=${LDFLAGS:Q} +ALL_ENV+= LDFLAGS=${LDFLAGS:C/^ *//:C/ *$//:Q} ALL_ENV+= LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q} ALL_ENV+= PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin ALL_ENV+= PREFIX=${PREFIX} @@ -402,7 +402,7 @@ _ULIMIT_CMD+= ${ULIMIT_CMD_${__tmp__}} ; .if defined(GNU_CONFIGURE) CONFIG_SHELL?= ${SH} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} -CONFIGURE_ENV+= LIBS=${LIBS:Q} +CONFIGURE_ENV+= LIBS=${LIBS:C/^ *//:C/ *$//:Q} CONFIGURE_ENV+= install_sh=${INSTALL:Q} . if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN_CMD) CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh} |