pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Work around brain damaged autoconf by stripping lea...
details: https://anonhg.NetBSD.org/pkgsrc/rev/723accdb167a
branches: trunk
changeset: 492903:723accdb167a
user: tv <tv%pkgsrc.org@localhost>
date: Thu Apr 21 15:53:53 2005 +0000
description:
Work around brain damaged autoconf by stripping leading and trailing
whitespace from *FLAGS and LIBS before doing :Q quoting.
Should fix PR pkg/29945.
diffstat:
mk/bsd.pkg.mk | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (47 lines):
diff -r facd486312e9 -r 723accdb167a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Thu Apr 21 15:50:35 2005 +0000
+++ b/mk/bsd.pkg.mk Thu Apr 21 15:53:53 2005 +0000
@@ -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 @@
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_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 @@
.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}
Home |
Main Index |
Thread Index |
Old Index