pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc If we're passing through MAKEFLAGS variables whose val...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/516148e3215a
branches:  trunk
changeset: 467791:516148e3215a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 06 19:04:24 2004 +0000

description:
If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.

diffstat:

 archivers/bzip2/buildlink3.mk     |   6 +++---
 converters/libiconv/buildlink3.mk |   4 ++--
 databases/db/buildlink3.mk        |   4 ++--
 databases/py-postgresql/Makefile  |   4 ++--
 devel/binutils/buildlink3.mk      |   4 ++--
 devel/cpuflags/files/cpuflags.mk  |   4 ++--
 devel/gettext-lib/buildlink3.mk   |   6 +++---
 devel/ncurses/buildlink3.mk       |   8 ++++----
 devel/readline/buildlink3.mk      |   6 +++---
 devel/zlib/buildlink2.mk          |   4 ++--
 devel/zlib/buildlink3.mk          |   4 ++--
 graphics/MesaLib/buildlink3.mk    |   6 +++---
 graphics/freetype2/buildlink3.mk  |   6 +++---
 graphics/glu/buildlink3.mk        |   6 +++---
 graphics/xpm/buildlink3.mk        |   6 +++---
 lang/gcc3-c/Makefile.common       |   4 ++--
 lang/perl5/buildlink2.mk          |  12 ++++++------
 lang/perl5/buildlink3.mk          |  12 ++++++------
 lang/perl58/Makefile              |   4 ++--
 mk/bsd.prefs.mk                   |  14 +++++++-------
 mk/endian.mk                      |   4 ++--
 net/bind8/Makefile                |   4 ++--
 net/samba/Makefile                |   6 +++---
 net/samba2/Makefile               |   6 +++---
 pkgtools/gensolpkg/Makefile       |   4 ++--
 print/texfamily/Makefile          |   4 ++--
 security/heimdal/buildlink3.mk    |   8 ++++----
 security/openssl/buildlink2.mk    |   6 +++---
 security/openssl/buildlink3.mk    |   6 +++---
 x11/XF86Setup/Makefile            |   4 ++--
 x11/Xrender/buildlink3.mk         |   6 +++---
 x11/xscreensaver/Makefile.common  |   4 ++--
 x11/xservers/Makefile             |   4 ++--
 33 files changed, 95 insertions(+), 95 deletions(-)

diffs (truncated from 817 to 300 lines):

diff -r f78fe8574a9d -r 516148e3215a archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Fri Feb 06 18:55:04 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk     Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@
                ${ECHO} "NO";                                           \
        fi
 .  endif
-MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.bzip2="${BUILDLINK_IS_BUILTIN.bzip2}"
+MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -56,7 +56,7 @@
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.bzip2="${BUILDLINK_USE_BUILTIN.bzip2}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.bzip2=${BUILDLINK_USE_BUILTIN.bzip2}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.bzip2:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Fri Feb 06 18:55:04 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=  ${ICONV_BUILDLINK3_MK}+
@@ -46,7 +46,7 @@
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.iconv="${BUILDLINK_USE_BUILTIN.iconv}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.iconv=${BUILDLINK_USE_BUILTIN.iconv}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk        Fri Feb 06 18:55:04 2004 +0000
+++ b/databases/db/buildlink3.mk        Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=    ${DB2_BUILDLINK3_MK}+
@@ -29,7 +29,7 @@
 BUILDLINK_TRANSFORM+=          l:db:db1
 .    endif
 .  endif
-MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.db="${BUILDLINK_USE_BUILTIN.db}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.db=${BUILDLINK_USE_BUILTIN.db}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.db:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a databases/py-postgresql/Makefile
--- a/databases/py-postgresql/Makefile  Fri Feb 06 18:55:04 2004 +0000
+++ b/databases/py-postgresql/Makefile  Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/20 14:11:50 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/06 19:04:24 jlam Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-postgresql-3.3
 PKGREVISION=   2
@@ -17,7 +17,7 @@
 
 MAKEFILE=              GNUmakefile
 MAKE_ENV+=             INSTALLED_LIBPQ=1
-MAKEFLAGS+=            PYTHON_VERSION="${PYVERSSUFFIX}"
+MAKEFLAGS+=            PYTHON_VERSION=${PYVERSSUFFIX}
 
 PY_PATCHPLIST=         yes
 PLIST_SUBST+=          PYPKGPREFIX=${PYPKGPREFIX}
diff -r f78fe8574a9d -r 516148e3215a devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk      Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/binutils/buildlink3.mk      Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=       ${BINUTILS_BUILDLINK3_MK}+
@@ -54,7 +54,7 @@
 .    endfor
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.binutils="${BUILDLINK_USE_BUILTIN.binutils}"
+       BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a devel/cpuflags/files/cpuflags.mk
--- a/devel/cpuflags/files/cpuflags.mk  Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.mk  Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $Id: cpuflags.mk,v 1.13 2004/01/21 00:54:08 abs Exp $
+# $Id: cpuflags.mk,v 1.14 2004/02/06 19:04:24 jlam Exp $
 # Makefile include fragment to simplify use of cpuflags in pkgsrc
 # abs%netbsd.org@localhost - freely distributable, no warrenties, stick no bills.
 
@@ -25,7 +25,7 @@
 .endif
 
 .if !defined(MAKEFLAGS) || empty(MAKEFLAGS:MCPU_FLAGS)
-MAKEFLAGS+=CPU_FLAGS="${CPU_FLAGS}" CPU_DIR="${CPU_DIR}"       # For sub makes
+MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS:Q} CPU_DIR=${CPU_DIR:Q}       # For sub makes
 .endif
 
 .ifdef BSD_PKG_MK                      # Try to catch various package opts
diff -r f78fe8574a9d -r 516148e3215a devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=        ${GETTEXT_BUILDLINK3_MK}+
@@ -65,7 +65,7 @@
 .    endfor
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.gettext="${BUILDLINK_USE_BUILTIN.gettext}"
+       BUILDLINK_USE_BUILTIN.gettext=${BUILDLINK_USE_BUILTIN.gettext}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
@@ -110,7 +110,7 @@
        else                                                            \
                ${ECHO} "YES";                                          \
        fi
-MAKEFLAGS+=    _BLNK_LIBINTL_FOUND="${_BLNK_LIBINTL_FOUND}"
+MAKEFLAGS+=    _BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
 .    endif
 .    if ${_BLNK_LIBINTL_FOUND} == "YES"
 _BLNK_LIBINTL=         -lintl
diff -r f78fe8574a9d -r 516148e3215a devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk       Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/ncurses/buildlink3.mk       Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=        ${NCURSES_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@
        else                                                            \
                ${ECHO} "YES";                                          \
        fi
-MAKEFLAGS+=    _BLNK_LIBNCURSES_FOUND="${_BLNK_LIBNCURSES_FOUND}"
+MAKEFLAGS+=    _BLNK_LIBNCURSES_FOUND=${_BLNK_LIBNCURSES_FOUND}
 .endif
 
 _NCURSES_H=    /usr/include/curses.h
@@ -37,7 +37,7 @@
                ${ECHO} "NO";                                           \
        fi
 .  endif
-MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.ncurses="${BUILDLINK_IS_BUILTIN.ncurses}"
+MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -107,7 +107,7 @@
 .    endfor
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.ncurses="${BUILDLINK_USE_BUILTIN.ncurses}"
+       BUILDLINK_USE_BUILTIN.ncurses=${BUILDLINK_USE_BUILTIN.ncurses}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a devel/readline/buildlink3.mk
--- a/devel/readline/buildlink3.mk      Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/readline/buildlink3.mk      Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -57,7 +57,7 @@
 .    endfor
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.readline="${BUILDLINK_USE_BUILTIN.readline}"
+       BUILDLINK_USE_BUILTIN.readline=${BUILDLINK_USE_BUILTIN.readline}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.readline:M[nN][oO])
@@ -75,7 +75,7 @@
        else                                                            \
                ${ECHO} "YES";                                          \
        fi
-MAKEFLAGS+=    _BLNK_LIBEDIT_FOUND="${_BLNK_LIBEDIT_FOUND}"
+MAKEFLAGS+=    _BLNK_LIBEDIT_FOUND=${_BLNK_LIBEDIT_FOUND}
 .    endif
 .    if ${_BLNK_LIBEDIT_FOUND} == "YES"
 BUILDLINK_TRANSFORM+=          l:history:edit
diff -r f78fe8574a9d -r 516148e3215a devel/zlib/buildlink2.mk
--- a/devel/zlib/buildlink2.mk  Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/zlib/buildlink2.mk  Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=    # defined
@@ -74,7 +74,7 @@
                ${ECHO} "NO";                                           \
        fi
 .  endif
-MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.zlib=${BUILDLINK_USE_BUILTIN.zlib}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a devel/zlib/buildlink3.mk
--- a/devel/zlib/buildlink3.mk  Fri Feb 06 18:55:04 2004 +0000
+++ b/devel/zlib/buildlink3.mk  Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=   ${ZLIB_BUILDLINK3_MK}+
@@ -87,7 +87,7 @@
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
+MAKEFLAGS+=    BUILDLINK_USE_BUILTIN.zlib=${BUILDLINK_USE_BUILTIN.zlib}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a graphics/MesaLib/buildlink3.mk
--- a/graphics/MesaLib/buildlink3.mk    Fri Feb 06 18:55:04 2004 +0000
+++ b/graphics/MesaLib/buildlink3.mk    Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=        ${MESALIB_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@
                ${ECHO} "NO";                                           \
        fi
 .  endif
-MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.MesaLib="${BUILDLINK_IS_BUILTIN.MesaLib}"
+MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.MesaLib=${BUILDLINK_IS_BUILTIN.MesaLib}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -65,7 +65,7 @@
 .    endfor
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.MesaLib="${BUILDLINK_USE_BUILTIN.MesaLib}"
+       BUILDLINK_USE_BUILTIN.MesaLib=${BUILDLINK_USE_BUILTIN.MesaLib}
 .endif # BUILDLINK_USE_BUILTIN.MesaLib
 
 .if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a graphics/freetype2/buildlink3.mk
--- a/graphics/freetype2/buildlink3.mk  Fri Feb 06 18:55:04 2004 +0000
+++ b/graphics/freetype2/buildlink3.mk  Fri Feb 06 19:04:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=      ${FREETYPE2_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@
        fi
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_IS_BUILTIN.freetype2="${BUILDLINK_IS_BUILTIN.freetype2}"
+       BUILDLINK_IS_BUILTIN.freetype2=${BUILDLINK_IS_BUILTIN.freetype2}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -71,7 +71,7 @@
 .    endfor
 .  endif
 MAKEFLAGS+=    \
-       BUILDLINK_USE_BUILTIN.freetype2="${BUILDLINK_USE_BUILTIN.freetype2}"
+       BUILDLINK_USE_BUILTIN.freetype2=${BUILDLINK_USE_BUILTIN.freetype2}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[nN][oO])
diff -r f78fe8574a9d -r 516148e3215a graphics/glu/buildlink3.mk
--- a/graphics/glu/buildlink3.mk        Fri Feb 06 18:55:04 2004 +0000
+++ b/graphics/glu/buildlink3.mk        Fri Feb 06 19:04:24 2004 +0000



Home | Main Index | Thread Index | Old Index