diff options
| author | jlam <jlam> | 2004-03-18 10:47:04 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-03-18 10:47:04 +0000 |
| commit | 3d6575a865179b82b28778e2622096e05877dc57 (patch) | |
| tree | 6d2d4accdd312a553fe3a794ad11490f2ef54353 /pkgtools | |
| parent | 233b07602d29a6873db5d5f6d4bc8f9ed2b3f959 (diff) | |
| download | pkgsrc-3d6575a865179b82b28778e2622096e05877dc57.tar.gz | |
Update pkgtools/createbuildlink to 3.4. Changes from version 3.3
include creating buildlink3.mk files that include other buildlink3.mk
files outside of the region that is protected against multiple inclusion.
This is required to fix a bug in properly ordering the packages listed
in BUILDLINK_PACKAGES.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 07637d632d4..6b618fddbc9 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2004/03/06 15:11:22 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/03/18 10:47:04 jlam Exp $ -DISTNAME= createbuildlink-3.3 +DISTNAME= createbuildlink-3.4 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index 288cc6bb52f..29f0e7c63d5 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.20 2004/03/06 15:11:22 jlam Exp $ +# $NetBSD: createbuildlink,v 1.21 2004/03/18 10:47:04 jlam Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,7 +40,7 @@ # and PLIST # -REV=`echo '$Revision: 1.20 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.21 $' | sed 's/\\$//g'` tmpdir=/tmp spacesintab=8 makefile=Makefile @@ -85,7 +85,7 @@ if [ ! -f $makefile ]; then exit 1 fi -if [ ! -f "$PLIST" ]; then +if [ $blver = 2 -a ! -f "$PLIST" ]; then echo "===> Incomplete package! To create a buildlink file <===" echo "===> a working PLIST is required! <===" exit 1 @@ -136,6 +136,11 @@ sed -f $sedrules <<EOF # XXX After this file as been verified as correct, the comment lines # XXX beginning with "XXX" should be removed. Please do not commit # XXX unverified buildlink[23].mk files. +# XXX +# XXX Packages that only install static libraries or headers should +# XXX include the following line: +# XXX +# XXX BUILDLINK_DEPMETHOD.$PKGNOVER?= build EOF @@ -198,6 +203,14 @@ sed -f $sedrules <<EOF BUILDLINK_PKGSRCDIR.$PKGNOVER?= ../../$CURDIR EOF +if [ $blver = 3 ]; then + +sed -f $sedrules <<EOF +.endif # ${PKGUPPER}_BUILDLINK3_MK +EOF + +fi + ## ## buildlink2-only part ## @@ -244,8 +257,10 @@ for i in $makefile $commons ; do sed "s/buildlink$otherver/buildlink$blver/" | egrep -v '/devel/pkgconfig/|/textproc/intltool/' done +if [ $blver = 2 ]; then grep -l '^.include.*\.\.\/.*\/.*/buildlink[23].mk\"' $makefile $commons \ >/dev/null 2>&1 && echo "" # Be careful not to print duplicate \n +fi ## ## buildlink2-only part @@ -271,7 +286,6 @@ EOF else # buildlink 3 sed -f $sedrules <<EOF -.endif # ${PKGUPPER}_BUILDLINK3_MK BUILDLINK_DEPTH:= \${BUILDLINK_DEPTH:S/+\$//} EOF |