pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Initial commit of a new wrapper script framework th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4dbcdc54bd48
branches: trunk
changeset: 480844:4dbcdc54bd48
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Sep 21 15:01:38 2004 +0000
description:
Initial commit of a new wrapper script framework that encapsulates
the non-buildlink-related code and moves it out of mk/buildlink3 into
mk/wrapper. The buildlink3 code is modified to simply hook its
transformations into the wrapper script framework.
The wrapper script framework has some new features:
* Support automatically passing "ABI" flags to the compiler and linker
depending on the value of ${ABI}. Currently supports the SunPro
compiler with ${ABI} == 64 and the MIPSPro compiler with ${ABI} as
any of 32, n32, o32, and 64.
* making UnixWare GCC accept -rpath options and silently converting
them into an appropriate LD_RUN_PATH
* Add cmd-sink-interix-gcc and cmd-sink-interix-ld that errors out
when it sees -fpic/-fPIC and -shared/-Bshareable, respectively
(requested by <tv>).
* Much improved debugging output. It's possible to output the wrapper
work log in-line with normal output by setting WRAPPER_LOG to
"stderr".
Important differences in behaviour from the old buildlink3 code include:
* Only move the -l options to the end of the command line, leaving the
-L options in-place.
* Extend the autodetection of the libtool mode to detect "compile" and
"uninstall".
* Fix problem noted in both PR pkg/24760 and PR pkg/25500, where
-L/usr/lib/* was being mangled improperly.
* Remove the top-level "buildlink" target; instead, make buildlinking
occur as part of the "wrapper" target.
* mangle and sub-mangle are only meant to transform directories in
-I, -L, and rpath options, so remove the lines in
buildlink3/gen-transform.sh that transformed bare directories.
* Add the ability for the libtool wrapper to be called just to unwrap
an existing libtool archive by running:
libtool --mode=unwrap -o libfoo.la
The old --fix-la syntax no longer works.
20040818
========
* Initial release of a new wrapper script framework that encapsulates
the non-buildlink-related code and moves it out of mk/buildlink3.
These features include:
* making MIPSpro accept GCC options
* making MIPSpro "ucode" accept GCC options
* making SunPro accept GCC options
* making "ld" accept -Wl,* options and silently removing the "-Wl,"
* (NEW) making UnixWare GCC accept -rpath options and silently
converting them into an appropriate LD_RUN_PATH
One major benefit of this is that the buildlink3 code is now much
tighter and easier to understand since it concerns itself solely
with buildlink-related details. I haven't yet optimized the wrapper
cache, so the new wrapper scripts may take slightly longer to execute
than the old buildlink3 wrapper scripts, but I'll be improving this
over time.
20040821
========
* Move the inclusion of $cmd_sink outside of the main loop in wrapper.sh
so that the $cmd_sink script can be used to globally scan and process
the arguments. Move the LD_RUN_PATH code to a cmd-sink-unixware-gcc
script. Garbage-collect the now unused export_vars-related code.
* Add cmd-sink-aix-xlc for AIX xlc that munges -Wl,-R* into an
appropriate -blibpath option.
* Add cmd-sink-interix-gcc and cmd-sink-interix-ld that errors out
when it sees -fpic/-fPIC and -shared/-Bshareable, respectively
(requested by <tv>).
* Move the code that converts full paths to shared libraries into the
"-Ldir -llib" equivalents from the buildlink3 code into wrapper/logic.
Remove the same from bsd.buildlink3.mk and gen-transform.sh.
* Move the code that checks for absolute rpaths from the buildlink3
code into wrapper/arg-source. Remove the same from bsd.buildlink3.mk
and gen-transform.sh.
* Only move the -l options to the end of the command line, leaving the
-L options in-place.
* Add more debugging code.
20040824
========
* Fix quoting problems after arguments are transformed. Remove the
hack that was inserted that magically made almost everything work
because we do it the right way now.
* Move the inclusion of $logic outside of the main loop in wrapper.sh
so that the $logic script doesn't have to worry about underflowing
the argument buffer.
* Encapsulate the loop in wrapper.sh that fills the argument buffer
entirely within the arg-source script.
* Move from the logic script into the arg-source script the
transformations that merge or split arguments.
* Fix bug where skipargs was effectively being ignored if it was more
than 1.
* Handle the whitespace in transformations in the logic script that
turn one library option into multiple library options, e.g.
"-lreadline" -> "-ledit -ltermcap".
* Allow you to specify an environment variable WRAPPER_SKIP_TRANSFORM
for whether you wish to skip the transformation step in the logic
script. This is intended for testing purposes.
* Added check_prog() and init_lib() functions to the shell code library
to make it more reusable outside of the wrapper framework.
* Allow the msg_log() function to output to "stdout" or "stderr". If
you want to have all of the logging appear on the screen, then you
can now set WRAPPER_LOG=stderr.
* Make some of the script components not overridable on a per-wrapper
basis.
* Add a gen-transform.sh script that generates transformation sedfiles.
The "transform" script is used to transform arguments, while the
"untransform" script is used to unwrap files. Move the no-rpath
logic from buildlink3/gen-transform.sh into wrapper/gen-transform.sh
since it's not buildlink3-specific.
* Check for a non-empty blibpath before adding the option in
cmd-sink-aix-xlc.
* Extend the autodetection of the libtool mode to detect "compile" and
"uninstall".
* Add a cmd-sink-libtool script that doesn't pass linker options to
libtool unless we're in "link" mode.
* Set _USE_RPATH to "yes" for UnixWare so that the wrappers will see the
rpath options and convert them to a LD_RUN_PATH definition.
* Add more debugging code.
20040826
========
* Rewrite buildlink3/gen-transform.sh to produce more precise sed commands.
Drop some unused commands from the mini-language, and add a few more
that are more restrictive in their scope.
* Fix problem where repeated options weren't properly handled by some
of sed commands. It's not enough that they're "global replace",
since some patterns match separator characters before and after each
option. We must repeat those patterns twice to catch all instances
correctly.
* Fix problem noted in both PR pkg/24760 and PR pkg/25500, where
-L/usr/lib/* was being mangled improperly.
* Remove the top-level "buildlink" target; instead, make buildlinking
occur as part of the "wrapper" target.
* Add more debugging code.
20040828
========
* Added a head_queue function to shell-lib that returns the head of the
named queue without popping it off the front of the queue.
* Strip consecutive, repeated library options from the command line when
we read it in the logic script.
* Be more careful about not underflowing the argument buffer.
20040906
========
* shell-lib was moved into pkgsrc/mk/scripts; correct references to that
file in the wrapper code.
* Use opt-sub instead of sub-mangle when protecting -I/usr/include/*
and -L/usr/lib/* from buildlink transformations. This avoids adding
lines that look like "-I-I..." in the transformation sedfiles.
* mangle and sub-mangle are only meant to transform directories in
-I, -L, and rpath options, so remove the lines in
buildlink3/gen-transform.sh that transformed bare directories.
* Fix bug in strip-slashdot where the "." wasn't backquoted and thus
matched all characters instead of only the "." character.
* Change the libtool wrapper to use a modified buildcmd script that
doesn't rearrange any of the arguments. This should fix spurious
problems where libtool doesn't understand how to parse the command
line when the -l options are moved to the end of the argument list.
* Fix bug in the logic script where the $cachearg and $cachedarg
weren't being properly set at all times, which caused the cache to
contain the wrong transformed argument.
20040907
========
* Support automatically passing "ABI" flags to the compiler and linker
depending on the value of ${ABI}. Currently supports the SunPro
compiler with ${ABI} == 64 and the MIPSPro compiler with ${ABI} as
any of 32, n32, o32, and 64.
* Move back the code that splits absolute paths to shared libraries
from arg-source back into logic. This allows us to correctly skip
splitting those paths based on the previous option. Also add a
sanity check that the library name in the split argument doesn't
contain a "/" since shell globs are not as precise as REs.
* Don't transform the path given after --dynamic-linker (used by GNU
ld for ELF linkage).
* Add the ability for the libtool wrapper to be called just to unwrap
an existing libtool archive by running:
libtool --mode=unwrap -o libfoo.la
20040914
========
* Add a loop in libtool-fix-la to ensure that all of the options listed
in the dependency_libs lines of *.lai files are processed. This fixes
a buildlink3 leakage bug.
* Merge the gen-transform.sh scripts between buildlink3 and wrapper and
place them all in wrapper. This makes sense since the commands simply
allow for many types of transformations, which buildlink3 takes
advantage of, but there is nothing inherently buildlink-ish about
those commands.
* Don't directly manipulate SUBST_SED.unwrap. Instead, create the
value of SUBST_SED.unwrap by combining several other variables
(currently just _UNWRAP_SED) to ensure that the correct ordering is
preserved.
* Correct some confusing debugging messages.
diffstat:
mk/bsd.pkg.mk | 82 +-
mk/bsd.prefs.mk | 6 +-
mk/buildlink3/BUILDLINK3_DG | 23 +-
mk/buildlink3/bsd.buildlink3.mk | 1031 +++++-----------------------
mk/buildlink3/bsd.builtin.mk | 36 +-
mk/buildlink3/buffer | 61 -
mk/buildlink3/buildcmd | 55 -
mk/buildlink3/buildcmd-libtool | 74 ++
mk/buildlink3/cleanup-libtool | 41 +
mk/buildlink3/cmd-sink-libtool | 60 +
mk/buildlink3/gen-transform.sh | 359 ----------
mk/buildlink3/ld-post-cache | 11 -
mk/buildlink3/ld-post-logic | 14 -
mk/buildlink3/libtool-fix-la | 378 ++++++----
mk/buildlink3/libtool-post-cache | 22 -
mk/buildlink3/libtool-post-logic | 85 --
mk/buildlink3/libtool.sh | 194 -----
mk/buildlink3/logic | 60 -
mk/buildlink3/marshall | 74 --
mk/buildlink3/mipspro-cc-post-cache | 12 -
mk/buildlink3/mipspro-cc-post-logic | 36 -
mk/buildlink3/mipspro-ucode-cc-post-cache | 12 -
mk/buildlink3/mipspro-ucode-cc-post-logic | 41 -
mk/buildlink3/post-cache | 4 -
mk/buildlink3/pre-cache | 3 -
mk/buildlink3/quotearg | 20 -
mk/buildlink3/scan-libtool | 125 +++
mk/buildlink3/sunpro-cc-post-cache | 12 -
mk/buildlink3/sunpro-cc-post-logic | 89 --
mk/buildlink3/transform-libtool | 119 +++
mk/buildlink3/wrapper.sh | 95 --
mk/compiler.mk | 8 +-
mk/compiler/mipspro.mk | 10 +-
mk/compiler/sunpro.mk | 5 +-
mk/defs.Interix.mk | 6 +-
mk/defs.UnixWare.mk | 9 +-
mk/wrapper/NOTES | 31 +
mk/wrapper/arg-source | 113 +++
mk/wrapper/bsd.wrapper.mk | 589 ++++++++++++++++
mk/wrapper/buildcmd | 75 ++
mk/wrapper/cache-footer | 38 +
mk/wrapper/cache-header | 37 +
mk/wrapper/cmd-sink | 42 +
mk/wrapper/cmd-sink-aix-xlc | 74 ++
mk/wrapper/cmd-sink-interix-gcc | 50 +
mk/wrapper/cmd-sink-interix-ld | 50 +
mk/wrapper/cmd-sink-ld | 67 +
mk/wrapper/cmd-sink-unixware-gcc | 72 ++
mk/wrapper/gen-reorder.sh | 142 +++
mk/wrapper/gen-transform.sh | 466 +++++++++++++
mk/wrapper/logic | 270 +++++++
mk/wrapper/transform-mipspro-cc | 78 ++
mk/wrapper/transform-mipspro-ucode-cc | 84 ++
mk/wrapper/transform-sunpro-cc | 115 +++
mk/wrapper/wrapper.sh | 107 +++
55 files changed, 3445 insertions(+), 2327 deletions(-)
diffs (truncated from 6531 to 300 lines):
diff -r f2477e8d802e -r 4dbcdc54bd48 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue Sep 21 14:45:49 2004 +0000
+++ b/mk/bsd.pkg.mk Tue Sep 21 15:01:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1498 2004/09/15 15:26:10 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1499 2004/09/21 15:01:38 jlam Exp $
#
# This file is in the public domain.
#
@@ -161,16 +161,6 @@
PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages."
.endif
-.if !empty(USE_BUILDLINK3:M[nN][oO])
-#
-# Set the default BUILDLINK_DIR, BUILDLINK_X11_DIR so that if no
-# buildlink3.mk files are included, then they still point to where headers
-# and libraries for installed packages and X11R6 may be found.
-#
-BUILDLINK_DIR?= ${LOCALBASE}
-BUILDLINK_X11_DIR?= ${X11BASE}
-.endif
-
.if defined(USE_IMAKE)
PREPEND_PATH+= ${X11BASE}/bin
USE_X11BASE?= implied
@@ -186,9 +176,9 @@
IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX} \
IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX} \
IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
-. if empty(USE_BUILDLINK3:M[nN][oO])
+. if !empty(USE_BUILDLINK3:M[yY][eE][sS])
MAKE_FLAGS+= CC="${CC}" CXX="${CXX}"
-. endif
+. endif
.endif
.if defined(USE_X11BASE)
USE_X11?= implied
@@ -362,7 +352,7 @@
. if (${PKG_FC} == "f2c-f77")
# this is a DEPENDS not BUILD_DEPENDS because of the
# shared Fortran libs
-. if empty(USE_BUILDLINK3:M[nN][oO])
+. if !empty(USE_BUILDLINK3:M[yY][eE][sS])
. include "../../lang/f2c/buildlink3.mk"
. else
DEPENDS+= f2c>=20001205nb3:../../lang/f2c
@@ -428,7 +418,7 @@
.endif
EXTRACT_COOKIE= ${WRKDIR}/.extract_done
-BUILDLINK_COOKIE= ${WRKDIR}/.buildlink_done
+WRAPPER_COOKIE= ${WRKDIR}/.wrapper_done
CONFIGURE_COOKIE= ${WRKDIR}/.configure_done
INSTALL_COOKIE= ${WRKDIR}/.install_done
TEST_COOKIE= ${WRKDIR}/.test_done
@@ -1215,13 +1205,8 @@
.include "../../mk/tools.mk"
-.if !empty(USE_BUILDLINK3:M[nN][oO])
-NO_BUILDLINK= # defined
-.endif
-.if !defined(NO_BUILDLINK)
-. if empty(USE_BUILDLINK3:M[nN][oO])
-. include "../../mk/buildlink3/bsd.buildlink3.mk"
-. endif
+.if !defined(NO_WRAPPER)
+. include "../../mk/wrapper/bsd.wrapper.mk"
.endif
.if defined(RECOMMENDED)
@@ -1433,17 +1418,17 @@
${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${TOOLS_COOKIE}
.endif
-# Disable buildlink
-.PHONY: buildlink
-.if defined(NO_BUILDLINK) && !target(buildlink)
-buildlink: tools
- ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_COOKIE}
+# Disable wrapper
+.PHONY: wrapper
+.if defined(NO_WRAPPER) && !target(wrapper)
+wrapper: tools
+ ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${WRAPPER_COOKIE}
.endif
# Disable configure
.PHONY: configure
.if defined(NO_CONFIGURE) && !target(configure)
-configure: buildlink
+configure: wrapper
${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
.endif
@@ -2996,7 +2981,7 @@
.endif
.PHONY: acquire-extract-lock acquire-patch-lock acquire-tools-lock
-.PHONY: acquire-buildlink-lock acquire-configure-lock acquire-build-lock
+.PHONY: acquire-wrapper-lock acquire-configure-lock acquire-build-lock
.PHONY: acquire-install-lock acquire-package-lock
acquire-extract-lock:
${_ACQUIRE_LOCK}
@@ -3004,7 +2989,7 @@
${_ACQUIRE_LOCK}
acquire-tools-lock:
${_ACQUIRE_LOCK}
-acquire-buildlink-lock:
+acquire-wrapper-lock:
${_ACQUIRE_LOCK}
acquire-configure-lock:
${_ACQUIRE_LOCK}
@@ -3016,7 +3001,7 @@
${_ACQUIRE_LOCK}
.PHONY: release-extract-lock release-patch-lock release-tools-lock
-.PHONY: release-buildlink-lock release-configure-lock release-build-lock
+.PHONY: release-wrapper-lock release-configure-lock release-build-lock
.PHONY: release-install-lock release-package-lock
release-extract-lock:
${_RELEASE_LOCK}
@@ -3024,7 +3009,7 @@
${_RELEASE_LOCK}
release-tools-lock:
${_RELEASE_LOCK}
-release-buildlink-lock:
+release-wrapper-lock:
${_RELEASE_LOCK}
release-configure-lock:
${_RELEASE_LOCK}
@@ -3065,14 +3050,14 @@
tools: patch acquire-tools-lock ${TOOLS_COOKIE} release-tools-lock
.endif
-.PHONY: buildlink
-.if !target(buildlink)
-buildlink: tools acquire-buildlink-lock ${BUILDLINK_COOKIE} release-buildlink-lock
+.PHONY: wrapper
+.if !target(wrapper)
+wrapper: tools acquire-wrapper-lock ${WRAPPER_COOKIE} release-wrapper-lock
.endif
.PHONY: configure
.if !target(configure)
-configure: buildlink acquire-configure-lock ${CONFIGURE_COOKIE} release-configure-lock
+configure: wrapper acquire-configure-lock ${CONFIGURE_COOKIE} release-configure-lock
.endif
.PHONY: build
@@ -3121,8 +3106,8 @@
${TOOLS_COOKIE}:
${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-tools PKG_PHASE=tools
-${BUILDLINK_COOKIE}:
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-buildlink PKG_PHASE=buildlink
+${WRAPPER_COOKIE}:
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-wrapper PKG_PHASE=wrapper
${CONFIGURE_COOKIE}:
.if ${INTERACTIVE_STAGE:Mconfigure} == "configure" && defined(BATCH)
@@ -3160,7 +3145,7 @@
${PACKAGE_COOKIE}:
${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package
-.PHONY: extract-message patch-message tools-message buildlink-message
+.PHONY: extract-message patch-message tools-message wrapper-message
.PHONY: configure-message build-message test-message
extract-message:
@${ECHO_MSG} "${_PKGSRC_IN}> Extracting for ${PKGNAME}"
@@ -3168,8 +3153,8 @@
@${ECHO_MSG} "${_PKGSRC_IN}> Patching for ${PKGNAME}"
tools-message:
@${ECHO_MSG} "${_PKGSRC_IN}> Overriding tools for ${PKGNAME}"
-buildlink-message:
- @${ECHO_MSG} "${_PKGSRC_IN}> Buildlinking for ${PKGNAME}"
+wrapper-message:
+ @${ECHO_MSG} "${_PKGSRC_IN}> Creating toolchain wrappers for ${PKGNAME}"
configure-message:
@${ECHO_MSG} "${_PKGSRC_IN}> Configuring for ${PKGNAME}"
build-message:
@@ -3177,7 +3162,7 @@
test-message:
@${ECHO_MSG} "${_PKGSRC_IN}> Testing for ${PKGNAME}"
-.PHONY: extract-cookie patch-cookie tools-cookie buildlink-cookie
+.PHONY: extract-cookie patch-cookie tools-cookie wrapper-cookie
.PHONY: configure-cookie build-cookie test-cookie
extract-cookie:
${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} >> ${EXTRACT_COOKIE}
@@ -3185,8 +3170,8 @@
${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${PATCH_COOKIE}
tools-cookie:
${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${TOOLS_COOKIE}
-buildlink-cookie:
- ${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${BUILDLINK_COOKIE}
+wrapper-cookie:
+ ${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${WRAPPER_COOKIE}
configure-cookie:
${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
build-cookie:
@@ -3198,7 +3183,7 @@
.ORDER: extract-message install-depends pre-extract do-extract post-extract extract-cookie
.ORDER: patch-message pre-patch do-patch post-patch patch-cookie
.ORDER: tools-message pre-tools do-tools post-tools tools-cookie
-.ORDER: buildlink-message pre-buildlink do-buildlink post-buildlink buildlink-cookie
+.ORDER: wrapper-message pre-wrapper do-wrapper post-wrapper wrapper-cookie
.ORDER: configure-message pre-configure pre-configure-override do-configure post-configure configure-cookie
.ORDER: build-message pre-build do-build post-build build-cookie
.ORDER: test-message pre-test do-test post-test test-cookie
@@ -3206,14 +3191,15 @@
# Please note that the order of the following targets is important, and
# should not be modified (.ORDER is not recognised by make(1) in a serial
# make i.e. without -j n)
-.PHONY: real-fetch real-extract real-patch real-tools real-buildlink
+.PHONY: real-fetch real-extract real-patch
+.PHONY: real-tools real-wrapper
.PHONY: real-configure real-build real-test real-install real-package
.PHONY: real-replace real-undo-replace
real-fetch: pre-fetch do-fetch post-fetch
real-extract: extract-message install-depends pre-extract do-extract post-extract extract-cookie
real-patch: patch-message pre-patch do-patch post-patch patch-cookie
real-tools: tools-message pre-tools do-tools post-tools tools-cookie
-real-buildlink: buildlink-message pre-buildlink do-buildlink post-buildlink buildlink-cookie
+real-wrapper: wrapper-message pre-wrapper do-wrapper post-wrapper wrapper-cookie
real-configure: configure-message pre-configure pre-configure-override do-configure post-configure configure-cookie
real-build: build-message pre-build do-build post-build build-cookie
real-test: test-message pre-test do-test post-test test-cookie
@@ -3289,7 +3275,7 @@
# Empty pre-* and post-* targets
-.for name in fetch extract patch tools buildlink configure build test install-script install package
+.for name in fetch extract patch tools wrapper configure build test install-script install package
. if !target(pre-${name})
pre-${name}:
diff -r f2477e8d802e -r 4dbcdc54bd48 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Tue Sep 21 14:45:49 2004 +0000
+++ b/mk/bsd.prefs.mk Tue Sep 21 15:01:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.165 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.166 2004/09/21 15:01:39 jlam Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -275,8 +275,8 @@
PHASES_AFTER_FETCH= fetch ${PHASES_AFTER_EXTRACT}
PHASES_AFTER_EXTRACT= extract ${PHASES_AFTER_PATCH}
PHASES_AFTER_PATCH= patch ${PHASES_AFTER_TOOLS}
-PHASES_AFTER_TOOLS= tools ${PHASES_AFTER_BUILDLINK}
-PHASES_AFTER_BUILDLINK= buildlink ${PHASES_AFTER_CONFIGURE}
+PHASES_AFTER_TOOLS= tools ${PHASES_AFTER_WRAPPER}
+PHASES_AFTER_WRAPPER= wrapper ${PHASES_AFTER_CONFIGURE}
PHASES_AFTER_CONFIGURE= configure ${PHASES_AFTER_BUILD}
PHASES_AFTER_BUILD= build ${PHASES_AFTER_INSTALL}
PHASES_AFTER_INSTALL= install ${PHASES_AFTER_PACKAGE}
diff -r f2477e8d802e -r 4dbcdc54bd48 mk/buildlink3/BUILDLINK3_DG
--- a/mk/buildlink3/BUILDLINK3_DG Tue Sep 21 14:45:49 2004 +0000
+++ b/mk/buildlink3/BUILDLINK3_DG Tue Sep 21 15:01:38 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: BUILDLINK3_DG,v 1.5 2004/07/30 20:52:44 jlam Exp $
+$NetBSD: BUILDLINK3_DG,v 1.6 2004/09/21 15:01:40 jlam Exp $
0 Developer's guide to buildlink3
=================================
@@ -28,18 +28,7 @@
used instead of the system libraries if they shared the same name.
- 1.3 Support for native compilers
- ================================
-
-The buildlink3 wrapper scripts have better support for using SunPro
-and MIPSpro compilers to build pkgsrc software. For the most part,
-packages can use any compiler, but some third-party software is
-written assuming that it will be compiled using GCC. The buildlink3
-wrapper scripts can capture some common GCC options and convert them
-into native toolchain equivalents.
-
-
- 1.4 New buildlink3.mk file structure
+ 1.2 New buildlink3.mk file structure
====================================
buildlink3.mk files have two major differences over buildlink2.mk
@@ -54,7 +43,7 @@
buildlink3.mk file for that dependency.
- 1.5 Support for pkgviews
+ 1.3 Support for pkgviews
========================
When building pkgviews packages, buildlink3 doesn't symlink files
@@ -98,7 +87,7 @@
Q4: Why can't I check the values of variables set by the buildlink3
framework using 'make show-var VARNAME=...'?
Home |
Main Index |
Thread Index |
Old Index