pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Retire buildlink2, now that all packages using it h...
details: https://anonhg.NetBSD.org/pkgsrc/rev/71bd9286285b
branches: trunk
changeset: 477669:71bd9286285b
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Jul 06 22:49:16 2004 +0000
description:
Retire buildlink2, now that all packages using it have been converted to
buildlink3.
diffstat:
mk/apache.mk | 8 +-
mk/bsd.pkg.defaults.mk | 8 +-
mk/bsd.pkg.mk | 16 +-
mk/bsd.prefs.mk | 5 +-
mk/buildlink2/NOTES | 35 -
mk/buildlink2/README | 46 -
mk/buildlink2/bsd.buildlink2.mk | 911 ---------------------------------------
mk/buildlink2/buildlink2.txt | 91 ---
mk/buildlink2/fake-la | 109 ----
mk/buildlink2/gen-transform.sh | 163 ------
mk/buildlink2/ld-logic | 8 -
mk/buildlink2/ld-post-cache | 6 -
mk/buildlink2/libtool-do-install | 17 -
mk/buildlink2/libtool-fix-la | 199 --------
mk/buildlink2/libtool-logic | 43 -
mk/buildlink2/libtool-post-cache | 6 -
mk/buildlink2/libtool.sh | 100 ----
mk/buildlink2/logic | 75 ---
mk/buildlink2/post-cache | 4 -
mk/buildlink2/pre-cache | 9 -
mk/buildlink2/private-pre-cache | 3 -
mk/buildlink2/wrapper.sh | 55 --
mk/compiler/gcc.mk | 8 +-
mk/pthread.buildlink2.mk | 223 ---------
mk/scripts/genreadme.awk | 4 +-
25 files changed, 16 insertions(+), 2136 deletions(-)
diffs (truncated from 2371 to 300 lines):
diff -r 27705cec4a7b -r 71bd9286285b mk/apache.mk
--- a/mk/apache.mk Tue Jul 06 22:41:15 2004 +0000
+++ b/mk/apache.mk Tue Jul 06 22:49:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.5 2003/12/11 13:51:28 grant Exp $
+# $NetBSD: apache.mk,v 1.6 2004/07/06 22:49:16 wiz Exp $
#
# This Makefile fragment handles Apache dependencies and make variables,
# and is meant to be included by packages that require Apache either at
@@ -133,8 +133,6 @@
.if defined(_APACHE_PKGSRCDIR)
. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
. include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
-. elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-. include "${_APACHE_BL_SRCDIR}/buildlink2.mk"
. else
DEPENDS+= ${_APACHE_DEPENDENCY}
. endif
@@ -146,8 +144,6 @@
.if defined(_APACHE_PKGSRCDIR)
. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
. include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
-. elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-. include "${_APACHE_BL_SRCDIR}/buildlink2.mk"
. else
BUILD_DEPENDS+= ${_APACHE_DEPENDENCY}
. endif
@@ -157,8 +153,6 @@
. if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS])
. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
. include "../../devel/apr/buildlink3.mk"
-. elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-. include "../../devel/apr/buildlink2.mk"
. endif
. endif
.endif
diff -r 27705cec4a7b -r 71bd9286285b mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk Tue Jul 06 22:41:15 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk Tue Jul 06 22:49:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.255 2004/07/06 11:32:49 abs Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.256 2004/07/06 22:49:16 wiz Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -1500,9 +1500,9 @@
# Default: NO
#MOTIF_TYPE?= openmotif
-# Used by motif.buildlink2.mk to choose which Motif-2.0-compatible
+# Used by motif.buildlink3.mk to choose which Motif-2.0-compatible
# installation to use. This value is also automatically set by
-# motif.buildlink2.mk to whichever Motif-2.0 installation represented by
+# motif.buildlink3.mk to whichever Motif-2.0 installation represented by
# the possible values below is already installed, but defaults to
# ${MOTIF_TYPE_DEFAULT}. This value is ignored if MOTIFBASE is
# explicitly set.
@@ -1510,7 +1510,7 @@
# Default: ${MOTIF_TYPE_DEFAULT}
#MOTIF_TYPE_DEFAULT?= openmotif
-# Used by motif.buildlink2.mk as the final default value for MOTIF_TYPE.
+# Used by motif.buildlink3.mk as the final default value for MOTIF_TYPE.
# Possible: openmotif, lesstif, dt (Irix and Solaris only)
# Default: openmotif, or dt (Irix and Solaris only)
diff -r 27705cec4a7b -r 71bd9286285b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue Jul 06 22:41:15 2004 +0000
+++ b/mk/bsd.pkg.mk Tue Jul 06 22:49:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1474 2004/07/06 11:28:55 abs Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1475 2004/07/06 22:49:16 wiz Exp $
#
# This file is in the public domain.
#
@@ -141,14 +141,10 @@
PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages."
.endif
-.if empty(USE_BUILDLINK2:M[nN][oO]) && empty(USE_BUILDLINK3:M[nN][oO])
-PKG_FAIL_REASON+= "Please undefine USE_BUILDLINK2 or USE_BUILDLINK3."
-.endif
-
.if !empty(USE_BUILDLINK3:M[nN][oO])
#
# Set the default BUILDLINK_DIR, BUILDLINK_X11_DIR so that if no
-# buildlink2.mk files are included, then they still point to where headers
+# 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}
@@ -170,7 +166,7 @@
IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX} \
IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX} \
IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
-. if empty(USE_BUILDLINK2:M[nN][oO]) || empty(USE_BUILDLINK3:M[nN][oO])
+. if empty(USE_BUILDLINK3:M[nN][oO])
MAKE_FLAGS+= CC="${CC}" CXX="${CXX}"
. endif
.endif
@@ -443,7 +439,7 @@
X11_LDFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib${ABI}
X11_LDFLAGS+= -L${X11BASE}/lib${ABI}
.endif
-.if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO])
+.if !empty(USE_BUILDLINK3:M[nN][oO])
LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
. if defined(USE_X11)
@@ -1166,14 +1162,12 @@
.include "../../mk/tools.mk"
-.if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO])
+.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"
-. elif empty(USE_BUILDLINK2:M[nN][oO])
-. include "../../mk/buildlink2/bsd.buildlink2.mk"
. endif
.endif
diff -r 27705cec4a7b -r 71bd9286285b mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Tue Jul 06 22:41:15 2004 +0000
+++ b/mk/bsd.prefs.mk Tue Jul 06 22:49:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.161 2004/07/02 16:27:48 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.162 2004/07/06 22:49:16 wiz Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -438,7 +438,6 @@
#
PKG_BEST_EXISTS?= ${PKG_ADMIN} -b -d ${_PKG_DBDIR} -S lsbest
-USE_BUILDLINK2?= no # default to not using buildlink2
USE_BUILDLINK3?= no # default to not using buildlink3
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
USE_BUILDLINK3= yes # pkgviews requires buildlink3
@@ -493,7 +492,7 @@
WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME}
# There are many uses for a common log file, so define one that may be
-# picked up and used by tools.mk, bsd.buildlink2.mk, etc.
+# picked up and used by tools.mk, bsd.buildlink3.mk, etc.
#
WRKLOG?= ${WRKDIR}/.work.log
diff -r 27705cec4a7b -r 71bd9286285b mk/buildlink2/NOTES
--- a/mk/buildlink2/NOTES Tue Jul 06 22:41:15 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: NOTES,v 1.14 2003/09/02 06:59:50 jlam Exp $
-
- Caching
- =======
-
-The caching problems seem to be related to correct manipulation of
-variables containing values with escaped metacharacters by the shell. The
-current code only does partial caching, which doesn't cache "special"
-arguments that contain escaped metacharacters or other oddly quoted values.
-On certain platforms listed in _BLNK_CACHE_ALL in bsd.buildlink2.mk, we do
-full caching, which has enormous speed benefits since it avoids an extra
-sed invocation per "special" argument.
-
-The test process for buildlink2 consists of building and installing:
-
- shells/tcsh tests handling of specially-quoted arguments
- devel/gettext-lib same as above, but uses libtool
- x11/xearth tests imake wrapper
-
-Full caching can be tested be adding ${MACHINE_PLATFORM} to _BLNK_CACHE_ALL
-and performing the tests above, but only building the packages is needed.
-
-Platform Working? Full caching?
--------- -------- -------------
-FreeBSD 4.7
-IRIX 6.5 (jschauma) Yes! Yes!
-Linux
-Darwin 5.5 (schmonz) Yes! No
-Darwin 6.2 (grant) Yes! Yes!
-NetBSD 1.5.x (gendalia)
-NetBSD 1.6 (jlam) Yes! Yes!
-OpenBSD (cjep)
-Solaris 7
-Solaris 8 (grant) Yes! Yes!
-Solaris 9 (salo) Yes! Yes!
diff -r 27705cec4a7b -r 71bd9286285b mk/buildlink2/README
--- a/mk/buildlink2/README Tue Jul 06 22:41:15 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: README,v 1.5 2002/12/26 17:08:56 jlam Exp $
-
-For more general information about the use of buildlink2, see the file
-buildlink2.txt in this directory.
-
- 0 buildlink2 Wrapper Script System
- ==================================
-
-The purpose of the buildlink2 wrapper script system is to replace calls to
-compiler tool with scripts that tranlate any arguments into their buildlink
-equivalents, then invoke the actual compiler tools with the translated
-arguments. The pkgsrc/mk/buildlink2 directory contains bits of the wrapper
-script system for the buildlink2 framework. The wrapper script system is
-composed of three parts: the main wrapper script, the "cache", and the
-"logic" script.
-
- 0.1 Main wrapper script
- =======================
-
-The main wrapper script for a compiler tool (cc, ld, as, etc.) is
-generated from wrapper.sh, except for the libtool wrapper script which is
-generated from libtool.sh. The wrapper scripts share a common set of logic
-files that translate arguments into their buildlink equivalents.
-
- 0.2 Cache
- =========
-
-The cache is a giant Bourne shell "case" statement that stores
-pre-translated arguments from previous wrapper invocations. This allows
-speedy translation of already-seen arguments without having to run the
-utilities needed to perform a translation from scratch. There are two
-caches: the common cache and a wrapper-specific cache. The common cache
-is used by all wrapper scripts. The wrapper-specific cache is read before
-the common cache and contains wrapper-specific argument translation that
-shouldn't be used by other wrapper scripts.
-
- 0.3 Logic script
- ================
-
-The logic script contains a large "case" statement that handles the
-actual translation of an argument into its buildlink equivalent. The logic
-script also invokes a wrapper-specific logic script which may contain extra
-commands that perform further translation of an argument after the main
-translation has been performed by the logic script. Finally, the logic
-script may save the translations results into a cache file if requested by
-the wrapper script.
diff -r 27705cec4a7b -r 71bd9286285b mk/buildlink2/bsd.buildlink2.mk
--- a/mk/buildlink2/bsd.buildlink2.mk Tue Jul 06 22:41:15 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,911 +0,0 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.125 2004/04/30 04:22:02 reed Exp $
-#
-# An example package buildlink2.mk file:
-#
-# -------------8<-------------8<-------------8<-------------8<-------------
-# BUILDLINK_PACKAGES+= foo
-# BUILDLINK_PKGBASE.foo= foo-lib
-# BUILDLINK_DEPENDS.foo?= foo-lib>=1.0
-# BUILDLINK_RECOMMENDED.foo?= foo-lib>=1.0nb1
-# BUILDLINK_PKGSRCDIR.foo?= ../../category/foo-lib
-#
-# EVAL_PREFIX+= BUILDLINK_PREFIX.foo=foo-lib
-# BUILDLINK_PREFIX.foo_DEFAULT= ${LOCALBASE}
-# BUILDLINK_FILES.foo= include/foo.h
-# BUILDLINK_FILES.foo+= include/bar.h
-# BUILDLINK_FILES.foo+= lib/libfoo.*
-#
-# # We want "-lbar" to eventually resolve to "-lfoo".
-# BUILDLINK_TRANSFORM+= l:bar:foo
-#
-# BUILDLINK_TARGETS+= foo-buildlink
-#
-# foo-buildlink: _BUILDLINK_USE
-# -------------8<-------------8<-------------8<-------------8<-------------
-#
-# Another example package buildlink2.mk file:
-#
-# -------------8<-------------8<-------------8<-------------8<-------------
-# BUILDLINK_PACKAGES+= baz
-# BUILDLINK_PKGBASE.baz= baz-devel
-# BUILDLINK_DEPENDS.baz?= baz-devel>=1.0
-# BUILDLINK_PKGSRCDIR.baz?= ../../category/baz-devel
-#
-# EVAL_PREFIX+= BUILDLINK_PREFIX.foo=foo-lib
-# BUILDLINK_PREFIX.baz_DEFAULT= ${LOCALBASE}
-# BUILDLINK_FILES_CMD.baz= \
-# ${BUILDLINK_PLIST_CMD.baz} | ${GREP} "^\(include\|lib\)"
-#
-# BUILDLINK_TARGETS+= baz-buildlink
-#
-# baz-buildlink: _BUILDLINK_USE
-# -------------8<-------------8<-------------8<-------------8<-------------
-#
-# The different variables that may be set in a buildlink2.mk file are
-# described below.
-#
-# The variable name convention used in this Makefile are:
-#
-# BUILDLINK_* public buildlink-related variables usable in other Makefiles
-# _BLNK_* private buildlink-related variables to this Makefile
-
-ECHO_BUILDLINK_MSG?= ${TRUE}
-
-BUILDLINK_DIR= ${WRKDIR}/.buildlink
-BUILDLINK_X11_DIR= ${BUILDLINK_DIR:H}/.buildlink-x11
-CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}"
Home |
Main Index |
Thread Index |
Old Index