Subject: Re: /usr/bin/sudo /usr/bin/xargs: environment is too large for exec
To: Jeremy C. Reed <reed@reedmedia.net>
From: Johnny C. Lam <jlam@NetBSD.org>
List: tech-pkg
Date: 03/21/2004 08:13:06
--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Sat, Mar 20, 2004 at 05:32:19PM -0800, Jeremy C. Reed wrote:
> Installing meta-pkgs/xfce4-extras even after all dependencies installed to
> many minutes.
>
> reed@puget:/usr/pkgsrc/meta-pkgs/xfce4-extras$ bmake install
> ===> Checking for vulnerabilities in xfce4-extras-4.0.4nb2
> ===> Installing for xfce4-extras-4.0.4nb2
> ===> Becoming root@puget.reedmedia.net to install xfce4-extras.
> /usr/bin/sudo /usr/bin/xargs: environment is too large for exec
> /usr/bin/xargs: environment is too large for exec
> /usr/bin/xargs: environment is too large for exec
> ===> Registering installation for xfce4-extras-4.0.4nb2
> /usr/bin/xargs: environment is too large for exec
> reed@puget:/usr/pkgsrc/meta-pkgs/xfce4-extras$
Please let me know if the attached patch helps. Instead of saving all
of the buildlink3 variables into the command-line environment, it
creates a Makefile fragment that is included within bsd.buildlink3.mk
that contains all of the buildlink3 variable definitions that we want
to pass to make(1) invocations on the same package Makefile.
Cheers,
-- Johnny Lam <jlam@NetBSD.org>
--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="vars.diff"
Index: ./mk/buildlink3/bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.127
diff -u -r1.127 bsd.buildlink3.mk
--- ./mk/buildlink3/bsd.buildlink3.mk 21 Mar 2004 00:03:32 -0000 1.127
+++ ./mk/buildlink3/bsd.buildlink3.mk 21 Mar 2004 08:07:32 -0000
@@ -53,6 +53,11 @@
BUILDLINK_X11_DIR= ${BUILDLINK_DIR:H}/.x11-buildlink
BUILDLINK_SHELL?= ${SH}
BUILDLINK_OPSYS?= ${OPSYS}
+_BLNK_VARS_MK= ${BUILDLINK_DIR}/vars.mk
+
+.if exists(${_BLNK_VARS_MK})
+. include "${_BLNK_VARS_MK}"
+.endif
# Prepend ${BUILDLINK_DIR}/bin to the PATH so that the wrappers are found
# first when searching for executables.
@@ -91,7 +96,7 @@
. if !defined(IGNORE_PKG.${_pkg_}) && \
(${BUILDLINK_PKGSRCDIR.${_pkg_}:C|.*/([^/]*/[^/]*)$|\1|} == ${PKGPATH})
IGNORE_PKG.${_pkg_}= yes
-MAKEFLAGS+= IGNORE_PKG.${_pkg_}=${IGNORE_PKG.${_pkg_}}
+BUILDLINK_VARS+= IGNORE_PKG.${_pkg_}
. endif
. endif
.endfor
@@ -309,7 +314,7 @@
. endif
. endfor
. if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
-MAKEFLAGS+= _BLNK_PKG_DBDIR.${_pkg_}=${_BLNK_PKG_DBDIR.${_pkg_}}
+BUILDLINK_VARS+= _BLNK_PKG_DBDIR.${_pkg_}
. endif
. endif
@@ -340,7 +345,7 @@
. endif
. endif
. if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found)
-MAKEFLAGS+= BUILDLINK_PREFIX.${_pkg_}=${BUILDLINK_PREFIX.${_pkg_}}
+BUILDLINK_VARS+= BUILDLINK_PREFIX.${_pkg_}
. endif
. endif
@@ -493,6 +498,11 @@
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib
+# Create the saved variables Makefile fragment to pass variables through
+# to sub-make processes invoked on the same Makefile.
+#
+do-buildlink: ${_BLNK_VARS_MK}
+
# Create the buildlink wrappers before any of the other buildlink targets
# are run, as the wrappers may need to be used in some of those targets.
#
@@ -843,7 +853,7 @@
else \
${ECHO} ${${_var_}}; \
fi
-MAKEFLAGS+= _BLNK_PHYSICAL_PATH.${_var_}=${_BLNK_PHYSICAL_PATH.${_var_}:Q}
+BUILDLINK_VARS+= _BLNK_PHYSICAL_PATH.${_var_}
. endif
.endfor
@@ -1735,3 +1745,21 @@
${_PKG_SILENT}${_PKG_DEBUG}${_BLNK_GEN_TRANSFORM} \
${_BLNK_TRANSFORM}
.endif # BUILDLINK_PHASES
+
+.PHONY: buildlink3-vars-mk
+buildlink3-vars-mk: ${_BLNK_VARS_MK}
+${_BLNK_VARS_MK}:
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+ ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${ECHO} "FOO!= ${ECHO} \"=> phase: \$${PKG_PHASE}\" 1>&2; ${ECHO} 0" >> ${.TARGET}.tmp
+.for _var_ in ${BUILDLINK_VARS}
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${ECHO} "${_var_}= ${${_var_}}" >> ${.TARGET}.tmp
+.endfor
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ if [ -f ${.TARGET}.tmp ]; then \
+ ${SORT} -u ${.TARGET}.tmp > ${.TARGET}; \
+ ${RM} -f ${.TARGET}.tmp; \
+ fi
+ ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
Index: ./archivers/bzip2/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/bzip2/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./archivers/bzip2/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./archivers/bzip2/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -10,7 +10,7 @@
${ECHO} "no"; \
fi
. endif
-MAKEFLAGS+= IS_BUILTIN.bzip2=${IS_BUILTIN.bzip2}
+BUILDLINK_VARS+= IS_BUILTIN.bzip2
.endif
CHECK_BUILTIN.bzip2?= no
Index: ./converters/libiconv/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/libiconv/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./converters/libiconv/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./converters/libiconv/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -7,7 +7,7 @@
else \
${ECHO} "yes"; \
fi
-MAKEFLAGS+= _LIBICONV_FOUND=${_LIBICONV_FOUND}
+BUILDLINK_VARS+= _LIBICONV_FOUND
.endif
_ICONV_H= /usr/include/iconv.h
@@ -66,7 +66,7 @@
${ECHO} "native"; \
fi
. endif
-MAKEFLAGS+= ICONV_TYPE=${ICONV_TYPE}
+BUILDLINK_VARS+= ICONV_TYPE
.endif
.if defined(GNU_CONFIGURE)
Index: ./devel/gettext-lib/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext-lib/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./devel/gettext-lib/builtin.mk 16 Mar 2004 17:40:54 -0000 1.2
+++ ./devel/gettext-lib/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -7,7 +7,7 @@
else \
${ECHO} "yes"; \
fi
-MAKEFLAGS+= _BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
+BUILDLINK_VARS+= _BLNK_LIBINTL_FOUND
.endif
_LIBINTL_H= /usr/include/libintl.h
@@ -26,10 +26,10 @@
# XXX Consider the base system libintl to be gettext-lib-0.10.35nb1.
#
BUILTIN_PKG.gettext= gettext-lib-0.10.35nb1
-MAKEFLAGS+= BUILTIN_PKG.gettext=${BUILTIN_PKG.gettext}
+BUILDLINK_VARS+= BUILTIN_PKG.gettext
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.gettext=${IS_BUILTIN.gettext}
+BUILDLINK_VARS+= IS_BUILTIN.gettext
.endif
CHECK_BUILTIN.gettext?= no
Index: ./devel/ncurses/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ncurses/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./devel/ncurses/builtin.mk 20 Mar 2004 19:28:46 -0000 1.2
+++ ./devel/ncurses/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -7,7 +7,7 @@
else \
${ECHO} "yes"; \
fi
-MAKEFLAGS+= _BLNK_LIBNCURSES_FOUND=${_BLNK_LIBNCURSES_FOUND}
+BUILDLINK_VARS+= _BLNK_LIBNCURSES_FOUND
.endif
_NCURSES_H= /usr/include/curses.h
@@ -38,10 +38,10 @@
} \
' ${_NCURSES_H}
BUILTIN_PKG.ncurses= ncurses-${_NCURSES_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.ncurses=${BUILTIN_PKG.ncurses}
+BUILDLINK_VARS+= BUILTIN_PKG.ncurses
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.ncurses=${IS_BUILTIN.ncurses}
+BUILDLINK_VARS+= IS_BUILTIN.ncurses
.endif
CHECK_BUILTIN.ncurses?= no
Index: ./devel/readline/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/readline/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./devel/readline/builtin.mk 13 Mar 2004 18:39:16 -0000 1.2
+++ ./devel/readline/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -7,7 +7,7 @@
else \
${ECHO} "yes"; \
fi
-MAKEFLAGS+= _BLNK_LIBREADLINE_FOUND=${_BLNK_LIBREADLINE_FOUND}
+BUILDLINK_VARS+= _BLNK_LIBREADLINE_FOUND
.endif
.if !defined(_BLNK_LIBEDIT_FOUND)
@@ -17,7 +17,7 @@
else \
${ECHO} "yes"; \
fi
-MAKEFLAGS+= _BLNK_LIBEDIT_FOUND=${_BLNK_LIBEDIT_FOUND}
+BUILDLINK_VARS+= _BLNK_LIBEDIT_FOUND
.endif
_READLINE_H= /usr/include/readline.h
@@ -54,10 +54,10 @@
${_READLINE_HEADER}
_READLINE_VERSION= ${_READLINE_MAJOR}.${_READLINE_MINOR}
BUILTIN_PKG.readline= readline-${_READLINE_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.readline=${BUILTIN_PKG.readline}
+BUILDLINK_VARS+= BUILTIN_PKG.readline
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.readline=${IS_BUILTIN.readline}
+BUILDLINK_VARS+= IS_BUILTIN.readline
.endif
CHECK_BUILTIN.readline?= no
Index: ./devel/zlib/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/zlib/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./devel/zlib/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./devel/zlib/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -40,9 +40,9 @@
. endif
. endfor
. endif
-MAKEFLAGS+= BUILTIN_PKG.zlib=${BUILTIN_PKG.zlib}
+BUILDLINK_VARS+= BUILTIN_PKG.zlib
. endif
-MAKEFLAGS+= IS_BUILTIN.zlib=${IS_BUILTIN.zlib}
+BUILDLINK_VARS+= IS_BUILTIN.zlib
.endif
CHECK_BUILTIN.zlib?= no
Index: ./fonts/Xft2/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./fonts/Xft2/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./fonts/Xft2/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -47,7 +47,7 @@
_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-MAKEFLAGS+= _XF86_VERSION=${_XF86_VERSION}
+BUILDLINK_VARS+= _XF86_VERSION
. endif
. for _xrender_version_ in ${_XFT2_VERSIONS}
. for _pattern_ in ${_XFT2_${_xrender_version_}}
@@ -58,10 +58,10 @@
. endfor
_XFT2_VERSION?= 0.0
BUILTIN_PKG.Xft2= Xft2-${_XFT2_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.Xft2=${BUILTIN_PKG.Xft2}
+BUILDLINK_VARS+= BUILTIN_PKG.Xft2
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.Xft2=${IS_BUILTIN.Xft2}
+BUILDLINK_VARS+= IS_BUILTIN.Xft2
.endif
CHECK_BUILTIN.Xft2?= no
Index: ./fonts/fontconfig/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontconfig/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./fonts/fontconfig/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./fonts/fontconfig/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -31,10 +31,10 @@
_FONTCONFIG_VERSION= \
${_FONTCONFIG_MAJOR}.${_FONTCONFIG_MINOR}.${_FONTCONFIG_REVISION}
BUILTIN_PKG.fontconfig= fontconfig-${_FONTCONFIG_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.fontconfig=${BUILTIN_PKG.fontconfig}
+BUILDLINK_VARS+= BUILTIN_PKG.fontconfig
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.fontconfig=${IS_BUILTIN.fontconfig}
+BUILDLINK_VARS+= IS_BUILTIN.fontconfig
.endif
CHECK_BUILTIN.fontconfig?= no
Index: ./graphics/MesaLib/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./graphics/MesaLib/builtin.mk 15 Mar 2004 17:38:10 -0000 1.3
+++ ./graphics/MesaLib/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -21,10 +21,10 @@
# Mesa software distributed with the built-in XFree86.
#
BUILTIN_PKG.MesaLib= MesaLib-${_MESA_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.MesaLib=${BUILTIN_PKG.MesaLib}
+BUILDLINK_VARS+= BUILTIN_PKG.MesaLib
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.MesaLib=${IS_BUILTIN.MesaLib}
+BUILDLINK_VARS+= IS_BUILTIN.MesaLib
.endif
CHECK_BUILTIN.MesaLib?= no
Index: ./graphics/freetype2/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./graphics/freetype2/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./graphics/freetype2/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -27,10 +27,10 @@
${AWK} 'BEGIN { patch=0; } /\#define[ ]*FREETYPE_PATCH/ { patch=$$3; } END { print "."patch; }' ${_FREETYPE2_FREETYPE_H}
_FREETYPE2_VERSION= ${_FREETYPE2_MAJOR}${_FREETYPE2_MINOR}${_FREETYPE2_PATCH}
BUILTIN_PKG.freetype2= freetype2-${_FREETYPE2_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.freetype2=${BUILTIN_PKG.freetype2}
+BUILDLINK_VARS+= BUILTIN_PKG.freetype2
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.freetype2=${IS_BUILTIN.freetype2}
+BUILDLINK_VARS+= IS_BUILTIN.freetype2
.endif
CHECK_BUILTIN.freetype2?= no
Index: ./graphics/glu/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glu/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./graphics/glu/builtin.mk 15 Mar 2004 17:38:10 -0000 1.2
+++ ./graphics/glu/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -21,10 +21,10 @@
# Mesa software distributed with the built-in XFree86.
#
BUILTIN_PKG.glu= glu-${_MESA_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.glu=${BUILTIN_PKG.glu}
+BUILDLINK_VARS+= BUILTIN_PKG.glu
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.glu=${IS_BUILTIN.glu}
+BUILDLINK_VARS+= IS_BUILTIN.glu
.endif
CHECK_BUILTIN.glu?= no
Index: ./graphics/xpm/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xpm/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./graphics/xpm/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./graphics/xpm/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -43,9 +43,9 @@
${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, "") } /\#define[ ]*XpmRevision/ { print alpha[$$3] }' ${_X11_XPM_H}
_XPM_VERSION= ${_XPM_MAJOR}${_XPM_MINOR}${_XPM_PATCH}
BUILTIN_PKG.xpm= xpm-${_XPM_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.xpm=${BUILTIN_PKG.xpm}
+BUILDLINK_VARS+= BUILTIN_PKG.xpm
. endif
-MAKEFLAGS+= IS_BUILTIN.xpm=${IS_BUILTIN.xpm}
+BUILDLINK_VARS+= IS_BUILTIN.xpm
.endif # USE_BUILTIN.xpm
CHECK_BUILTIN.xpm?= no
Index: ./pkgtools/x11-links/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./pkgtools/x11-links/builtin.mk 15 Mar 2004 17:30:18 -0000 1.3
+++ ./pkgtools/x11-links/builtin.mk 21 Mar 2004 08:07:33 -0000
@@ -1,6 +1,6 @@
# $NetBSD: builtin.mk,v 1.3 2004/03/15 17:30:18 recht Exp $
-.if !defined(XF86_VERSION)
+.if !defined(_XF86_VERSION)
_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def
_XF86_VERSION= 3.3
. if !exists(${_X11_CONFIG_VERSION_DEF})
@@ -23,10 +23,9 @@
_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
. else
_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
-XF86_VERSION= ${_XF86_VERSION}
. endif
. endif
-MAKEFLAGS+= XF86_VERSION=${XF86_VERSION}
+BUILDLINK_VARS+= _XF86_VERSION
.endif
USE_BUILTIN.x11-links?= no
Index: ./security/heimdal/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/heimdal/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./security/heimdal/builtin.mk 10 Mar 2004 17:57:14 -0000 1.1
+++ ./security/heimdal/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -42,10 +42,10 @@
_HEIMDAL_VERSION?= 0.2t
. endif
BUILTIN_PKG.heimdal= heimdal-${_HEIMDAL_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.heimdal=${BUILTIN_PKG.heimdal}
+BUILDLINK_VARS+= BUILTIN_PKG.heimdal
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.heimdal=${IS_BUILTIN.heimdal}
+BUILDLINK_VARS+= IS_BUILTIN.heimdal
.endif
CHECK_BUILTIN.heimdal?= no
Index: ./security/openssl/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./security/openssl/builtin.mk 10 Mar 2004 17:57:15 -0000 1.1
+++ ./security/openssl/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -74,9 +74,9 @@
. if !empty(_OPENSSL_VERSION:M0\.9\.6g) && (${_OPENSSL_HAS_FIX} == "yes")
BUILTIN_PKG.openssl= openssl-0.9.6l
. endif
-MAKEFLAGS+= BUILTIN_PKG.openssl=${BUILTIN_PKG.openssl}
+BUILDLINK_VARS+= BUILTIN_PKG.openssl
. endif
-MAKEFLAGS+= IS_BUILTIN.openssl=${IS_BUILTIN.openssl}
+BUILDLINK_VARS+= IS_BUILTIN.openssl
.endif
CHECK_BUILTIN.openssl?= no
@@ -114,7 +114,7 @@
fi
. endif
. endfor
-MAKEFLAGS+= _NEED_NEWER_OPENSSL=${_NEED_NEWER_OPENSSL}
+BUILDLINK_VARS+= _NEED_NEWER_OPENSSL
.endif
.if !empty(USE_BUILTIN.openssl:M[nN][oO]) && \
Index: ./textproc/expat/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/expat/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./textproc/expat/builtin.mk 10 Mar 2004 17:57:15 -0000 1.1
+++ ./textproc/expat/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -30,10 +30,10 @@
${_EXPAT_H}
_EXPAT_VERSION= ${_EXPAT_MAJOR}.${_EXPAT_MINOR}.${_EXPAT_MICRO}
BUILTIN_PKG.expat= expat-${_EXPAT_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.expat=${BUILTIN_PKG.expat}
+BUILDLINK_VARS+= BUILTIN_PKG.expat
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.expat=${IS_BUILTIN.expat}
+BUILDLINK_VARS+= IS_BUILTIN.expat
.endif
CHECK_BUILTIN.expat?= no
Index: ./x11/Xrandr/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrandr/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./x11/Xrandr/builtin.mk 10 Mar 2004 17:57:15 -0000 1.1
+++ ./x11/Xrandr/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -47,7 +47,7 @@
_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-MAKEFLAGS+= _XF86_VERSION=${_XF86_VERSION}
+BUILDLINK_VARS+= _XF86_VERSION
. endif
. for _xrandr_version_ in ${_XRANDR_VERSIONS}
. for _pattern_ in ${_XRANDR_${_xrandr_version_}}
@@ -58,10 +58,10 @@
. endfor
_XRANDR_VERSION?= 1.0
BUILTIN_PKG.Xrandr= Xrandr-${_XRANDR_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.Xrandr=${BUILTIN_PKG.Xrandr}
+BUILDLINK_VARS+= BUILTIN_PKG.Xrandr
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.Xrandr=${IS_BUILTIN.Xrandr}
+BUILDLINK_VARS+= IS_BUILTIN.Xrandr
.endif
CHECK_BUILTIN.Xrandr?= no
Index: ./x11/Xrender/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrender/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./x11/Xrender/builtin.mk 10 Mar 2004 17:57:15 -0000 1.1
+++ ./x11/Xrender/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -49,7 +49,7 @@
_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-MAKEFLAGS+= _XF86_VERSION=${_XF86_VERSION}
+BUILDLINK_VARS+= _XF86_VERSION
. endif
. for _xrender_version_ in ${_XRENDER_VERSIONS}
. for _pattern_ in ${_XRENDER_${_xrender_version_}}
@@ -60,10 +60,10 @@
. endfor
_XRENDER_VERSION?= 0.1
BUILTIN_PKG.Xrender= Xrender-${_XRENDER_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.Xrender=${BUILTIN_PKG.Xrender}
+BUILDLINK_VARS+= BUILTIN_PKG.Xrender
. endif
. endif
-MAKEFLAGS+= IS_BUILTIN.Xrender=${IS_BUILTIN.Xrender}
+BUILDLINK_VARS+= IS_BUILTIN.Xrender
.endif
CHECK_BUILTIN.Xrender?= no
Index: ./x11/randrext/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/randrext/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./x11/randrext/builtin.mk 10 Mar 2004 17:57:15 -0000 1.1
+++ ./x11/randrext/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -20,9 +20,9 @@
${_X11_EXTENSIONS_RANDR_H}
_RANDR_VERSION= ${_RANDR_MAJOR}${_RANDR_MINOR}
BUILTIN_PKG.randrext= randrext-${_RANDR_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.randrext=${BUILTIN_PKG.randrext}
+BUILDLINK_VARS+= BUILTIN_PKG.randrext
. endif
-MAKEFLAGS+= IS_BUILTIN.randrext=${IS_BUILTIN.randrext}
+BUILDLINK_VARS+= IS_BUILTIN.randrext
.endif
CHECK_BUILTIN.randrext?= no
Index: ./x11/render/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/render/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- ./x11/render/builtin.mk 10 Mar 2004 17:57:15 -0000 1.1
+++ ./x11/render/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -20,9 +20,9 @@
${_X11_EXTENSIONS_RENDER_H}
_RENDER_VERSION= ${_RENDER_MAJOR}${_RENDER_MINOR}
BUILTIN_PKG.render= render-${_RENDER_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.render=${BUILTIN_PKG.render}
+BUILDLINK_VARS+= BUILTIN_PKG.render
. endif
-MAKEFLAGS+= IS_BUILTIN.render=${IS_BUILTIN.render}
+BUILDLINK_VARS+= IS_BUILTIN.render
.endif
CHECK_BUILTIN.render?= no
Index: ./x11/xcursor/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xcursor/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./x11/xcursor/builtin.mk 16 Mar 2004 17:40:54 -0000 1.2
+++ ./x11/xcursor/builtin.mk 21 Mar 2004 08:07:34 -0000
@@ -23,9 +23,9 @@
${_X11_XCURSOR_XCURSOR_H}
_XCURSOR_VERSION= ${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION}
BUILTIN_PKG.xcursor= xcursor-${_XCURSOR_VERSION}
-MAKEFLAGS+= BUILTIN_PKG.xcursor=${BUILTIN_PKG.xcursor}
+BUILDLINK_VARS+= BUILTIN_PKG.xcursor
. endif
-MAKEFLAGS+= IS_BUILTIN.xcursor=${IS_BUILTIN.xcursor}
+BUILDLINK_VARS+= IS_BUILTIN.xcursor
.endif
CHECK_BUILTIN.xcursor?= no
--5mCyUwZo2JvN/JJP--