diff options
| author | tv <tv@pkgsrc.org> | 2004-10-15 14:41:11 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-15 14:41:11 +0000 |
| commit | f4d628a60403d5d3b3609f5e5cb0c281b595dc0e (patch) | |
| tree | 68e7977bfe1df84ca6e193407624ed9517e9fc33 /pkgtools | |
| parent | 87fdae91f597c01359e0fdd1e19e8269a35607a2 (diff) | |
| download | pkgsrc-f4d628a60403d5d3b3609f5e5cb0c281b595dc0e.tar.gz | |
3.8: When pulling existing .includes of buildlink3 files from the Makefile,
comment them out by default, and add a comment above them indicating that
only *directly* needed dependencies should be in the (edited, final) bl3
file.
This will hopefully encourage folks to reduce the amount of unnecessary bl3
recursion that is rampant in pkgsrc, making many packages "depend" directly
on APIs they never see nor use.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 53bb84603b5..ca26731f141 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2004/09/30 12:43:57 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2004/10/15 14:41:11 tv Exp $ -DISTNAME= createbuildlink-3.7 +DISTNAME= createbuildlink-3.8 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index 022bbf8cf01..81478a35b86 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.26 2004/09/26 23:48:09 rh Exp $ +# $NetBSD: createbuildlink,v 1.27 2004/10/15 14:41:11 tv Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,7 +39,7 @@ # Create an initial buildlink3.mk from a package's Makefile and PLIST # -REV=`echo '$Revision: 1.26 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.27 $' | sed 's/\\$//g'` tmpdir=/tmp spacesintab=8 makefile=Makefile @@ -176,10 +176,18 @@ EOF ## buildlinked dependencies ## grep -l '^.include.*\.\.\/.*\/.*/buildlink3.mk\"' $makefile $commons \ - >/dev/null 2>&1 && echo "" # Be careful not to print duplicate \n + >/dev/null 2>&1 && cat <<EOF + +# XXX +# XXX Uncomment and keep only the buildlink3 lines below which are directly +# XXX needed for dependencies to compile, link, and run. If this package +# XXX provides a wrappered API or otherwise does not expose the APIs of the +# XXX buildlink3 lines below to dependencies, remove them. +# XXX +EOF for i in $makefile $commons ; do [ ! -f $i ] || grep '^.include.*\.\.\/.*\/.*/buildlink3.mk\"' $i | - egrep -v '/devel/pkgconfig/|/textproc/intltool/' + egrep -v '/devel/pkgconfig/|/textproc/intltool/' | sed 's,^,#,' done sed -f $sedrules <<EOF |