Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove the do-external-lib and do-gnu-lib targets, along with
details: https://anonhg.NetBSD.org/src/rev/bd0f7f29ad7a
branches: trunk
changeset: 759249:bd0f7f29ad7a
user: plunky <plunky%NetBSD.org@localhost>
date: Fri Dec 03 21:38:46 2010 +0000
description:
Remove the do-external-lib and do-gnu-lib targets, along with
external/lib/Makefile and crypto/external/lib/Makefile, replacing
them all with SUBDIRs directly from lib/Makefile.
compat/compatsubdirs.mk becomes simpler now, as everything is built
from lib/Makefile, meaning all the libraries will now be built under
compat so update the set lists to account for that.
diffstat:
Makefile | 10 +--
compat/compatsubdir.mk | 32 +--------------
crypto/external/lib/Makefile | 18 --------
distrib/sets/lists/base/ad.mips64eb | 26 ++++++++++++-
distrib/sets/lists/base/ad.mips64el | 26 ++++++++++++-
distrib/sets/lists/base/md.amd64 | 14 ++++++-
distrib/sets/lists/base/md.sparc64 | 14 ++++++-
distrib/sets/lists/comp/ad.mips64eb | 42 ++++++++++++++++++++-
distrib/sets/lists/comp/ad.mips64el | 42 ++++++++++++++++++++-
distrib/sets/lists/comp/md.amd64 | 33 +++++++++++++++-
distrib/sets/lists/comp/md.sparc64 | 28 +++++++++++++-
external/Makefile | 4 +-
external/bsd/libdwarf/prepare-import.sh | 4 +-
external/bsd/libelf/prepare-import.sh | 4 +-
external/bsd/libevent/prepare-import.sh | 4 +-
external/lib/Makefile | 42 --------------------
gnu/Makefile | 4 +-
gnu/lib/Makefile | 17 --------
lib/Makefile | 67 +++++++++++++++++++++++++++++++-
19 files changed, 295 insertions(+), 136 deletions(-)
diffs (truncated from 907 to 300 lines):
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a Makefile
--- a/Makefile Fri Dec 03 20:51:21 2010 +0000
+++ b/Makefile Fri Dec 03 21:38:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.280 2010/11/28 18:40:54 skrll Exp $
+# $NetBSD: Makefile,v 1.281 2010/12/03 21:38:46 plunky Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -91,8 +91,6 @@
# external/bsd/pcc/libpcc.
# do-lib-libc: builds and installs prerequisites from lib/libc.
# do-lib: builds and installs prerequisites from lib.
-# do-gnu-lib: builds and installs prerequisites from gnu/lib.
-# do-external-lib: builds and installs prerequisites from external/lib.
# do-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/lib
# do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib
# do-sys-rump-kern-lib: builds and installs prereq. from sys/rump/kern/lib
@@ -240,7 +238,7 @@
BUILDTARGET+= do-libpcc
.endif
BUILDTARGETS+= do-lib-libc
-BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+= do-lib
.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
BUILDTARGETS+= do-sys-modules
.endif
@@ -419,7 +417,7 @@
BUILD_CC_LIB+= external/bsd/pcc/libpcc
.endif
-.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
do-${dir:S/\//-/g}: .PHONY .MAKE
.for targ in dependall install
${MAKEDIRTARGET} ${dir} ${targ}
@@ -430,7 +428,7 @@
COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc
.for dir in ${COMPAT_SUBDIR_LIST}
do-compat-${dir:S/\//-/g}: .PHONY .MAKE
-.for targ in obj dependall install
+.for targ in dependall install
${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
.endfor
.endfor
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a compat/compatsubdir.mk
--- a/compat/compatsubdir.mk Fri Dec 03 20:51:21 2010 +0000
+++ b/compat/compatsubdir.mk Fri Dec 03 21:38:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $
+# $NetBSD: compatsubdir.mk,v 1.5 2010/12/03 21:38:48 plunky Exp $
# Build netbsd libraries.
@@ -13,39 +13,11 @@
# XXX make this use MAKEOBJDIR
MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
-# XXX fix the "library" list to include all 'external' libs?
.if defined(BOOTSTRAP_SUBDIRS)
SUBDIR= ${BOOTSTRAP_SUBDIRS}
.else
-SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \
- ../../../lib/csu .WAIT \
- ../../../gnu/lib/libgcc4 .WAIT \
- ../../../lib/libc .WAIT \
- ../../../lib/libutil .WAIT \
- ../../../lib .WAIT \
- ../../../gnu/lib \
- ../../../external/bsd/bind/lib \
- ../../../external/bsd/libevent/lib \
- ../../../external/bsd/file/lib \
- ../../../external/public-domain/xz/lib \
+SUBDIR= ../../../lib .WAIT \
../../../libexec/ld.elf_so
-
-.if ${MKATF} != "no"
-SUBDIR+= ../../../external/bsd/atf/lib
-.endif
-
-.if (${MKLDAP} != "no")
-SUBDIR+= ../../../external/bsd/openldap/lib
-.endif
-
-.if (${MKBINUTILS} != "no")
-SUBDIR+= ../../../external/gpl3/binutils/lib
-.endif
-
-.if (${MKISCSI} != "no")
-SUBDIR+= ../../../external/bsd/iscsi/lib
-.endif
-
.endif
.include <bsd.subdir.mk>
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a crypto/external/lib/Makefile
--- a/crypto/external/lib/Makefile Fri Dec 03 20:51:21 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2010/03/20 02:07:33 uwe Exp $
-
-#
-# This Makefile exists to provide a single point to build
-# all crypto libraries provided by external packages that may
-# be used by other applications in the system.
-#
-
-.include <bsd.own.mk>
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+= ../bsd/openssl/lib
-SUBDIR+= .WAIT
-SUBDIR+= ../bsd/netpgp/lib
-SUBDIR+= ../bsd/openssh/lib
-.endif
-
-.include <bsd.subdir.mk>
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a distrib/sets/lists/base/ad.mips64eb
--- a/distrib/sets/lists/base/ad.mips64eb Fri Dec 03 20:51:21 2010 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb Fri Dec 03 21:38:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.29 2010/12/02 14:54:43 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.30 2010/12/03 21:38:48 plunky Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -49,6 +49,10 @@
./usr/lib/64/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
./usr/lib/64/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic
./usr/lib/64/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
+./usr/lib/64/libamu.so.4 base-compat-shlib compat,pic
+./usr/lib/64/libamu.so.4.0 base-compat-shlib compat,pic
+./usr/lib/64/libarchive.so.3 base-compat-shlib compat,pic
+./usr/lib/64/libarchive.so.3.1 base-compat-shlib compat,pic
./usr/lib/64/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic,binutils
@@ -75,10 +79,18 @@
./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/64/libdns.so.5.2 base-compat-shlib compat,pic
+./usr/lib/64/libdns_sd.so.0 base-compat-shlib compat,pic,mdns
+./usr/lib/64/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns
+./usr/lib/64/libdwarf.so.0 base-compat-shlib compat,pic
+./usr/lib/64/libdwarf.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/libedit.so.3 base-compat-shlib compat,pic
./usr/lib/64/libedit.so.3.0 base-compat-shlib compat,pic
+./usr/lib/64/libelf.so.0 base-compat-shlib compat,pic
+./usr/lib/64/libelf.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/64/libevent.so.3.2 base-compat-shlib compat,pic
+./usr/lib/64/libfetch.so.3 base-compat-shlib compat,pic
+./usr/lib/64/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/64/libform.so.6 base-compat-shlib compat,pic
./usr/lib/64/libform.so.6.0 base-compat-shlib compat,pic
./usr/lib/64/libgcc_s.so.1 base-compat-shlib compat,pic
@@ -290,6 +302,10 @@
./usr/lib/o32/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
./usr/lib/o32/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic
./usr/lib/o32/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
+./usr/lib/o32/libamu.so.4 base-compat-shlib compat,pic
+./usr/lib/o32/libamu.so.4.0 base-compat-shlib compat,pic
+./usr/lib/o32/libarchive.so.3 base-compat-shlib compat,pic
+./usr/lib/o32/libarchive.so.3.1 base-compat-shlib compat,pic
./usr/lib/o32/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libbfd.so.11 base-compat-shlib compat,pic,binutils
@@ -316,10 +332,18 @@
./usr/lib/o32/libdes.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/o32/libdns.so.5.2 base-compat-shlib compat,pic
+./usr/lib/o32/libdns_sd.so.0 base-compat-shlib compat,pic,mdns
+./usr/lib/o32/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns
+./usr/lib/o32/libdwarf.so.0 base-compat-shlib compat,pic
+./usr/lib/o32/libdwarf.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/libedit.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libedit.so.3.0 base-compat-shlib compat,pic
+./usr/lib/o32/libelf.so.0 base-compat-shlib compat,pic
+./usr/lib/o32/libelf.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libevent.so.3.2 base-compat-shlib compat,pic
+./usr/lib/o32/libfetch.so.3 base-compat-shlib compat,pic
+./usr/lib/o32/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/o32/libform.so.6 base-compat-shlib compat,pic
./usr/lib/o32/libform.so.6.0 base-compat-shlib compat,pic
./usr/lib/o32/libgcc_s.so.1 base-compat-shlib compat,pic
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a distrib/sets/lists/base/ad.mips64el
--- a/distrib/sets/lists/base/ad.mips64el Fri Dec 03 20:51:21 2010 +0000
+++ b/distrib/sets/lists/base/ad.mips64el Fri Dec 03 21:38:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.27 2010/12/02 14:54:43 christos Exp $
+# $NetBSD: ad.mips64el,v 1.28 2010/12/03 21:38:48 plunky Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -49,6 +49,10 @@
./usr/lib/64/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
./usr/lib/64/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic
./usr/lib/64/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
+./usr/lib/64/libamu.so.4 base-compat-shlib compat,pic
+./usr/lib/64/libamu.so.4.0 base-compat-shlib compat,pic
+./usr/lib/64/libarchive.so.3 base-compat-shlib compat,pic
+./usr/lib/64/libarchive.so.3.1 base-compat-shlib compat,pic
./usr/lib/64/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libbfd.so.11 base-compat-shlib compat,pic,binutils
@@ -75,10 +79,18 @@
./usr/lib/64/libdes.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/64/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/64/libdns.so.5.2 base-compat-shlib compat,pic
+./usr/lib/64/libdns_sd.so.0 base-compat-shlib compat,pic,mdns
+./usr/lib/64/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns
+./usr/lib/64/libdwarf.so.0 base-compat-shlib compat,pic
+./usr/lib/64/libdwarf.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/libedit.so.3 base-compat-shlib compat,pic
./usr/lib/64/libedit.so.3.0 base-compat-shlib compat,pic
+./usr/lib/64/libelf.so.0 base-compat-shlib compat,pic
+./usr/lib/64/libelf.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/64/libevent.so.3.2 base-compat-shlib compat,pic
+./usr/lib/64/libfetch.so.3 base-compat-shlib compat,pic
+./usr/lib/64/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/64/libform.so.6 base-compat-shlib compat,pic
./usr/lib/64/libform.so.6.0 base-compat-shlib compat,pic
./usr/lib/64/libgcc_s.so.1 base-compat-shlib compat,pic
@@ -290,6 +302,10 @@
./usr/lib/o32/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
./usr/lib/o32/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic
./usr/lib/o32/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
+./usr/lib/o32/libamu.so.4 base-compat-shlib compat,pic
+./usr/lib/o32/libamu.so.4.0 base-compat-shlib compat,pic
+./usr/lib/o32/libarchive.so.3 base-compat-shlib compat,pic
+./usr/lib/o32/libarchive.so.3.1 base-compat-shlib compat,pic
./usr/lib/o32/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libbfd.so.11 base-compat-shlib compat,pic,binutils
@@ -316,10 +332,18 @@
./usr/lib/o32/libdes.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/o32/libdns.so.5.2 base-compat-shlib compat,pic
+./usr/lib/o32/libdns_sd.so.0 base-compat-shlib compat,pic,mdns
+./usr/lib/o32/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns
+./usr/lib/o32/libdwarf.so.0 base-compat-shlib compat,pic
+./usr/lib/o32/libdwarf.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/libedit.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libedit.so.3.0 base-compat-shlib compat,pic
+./usr/lib/o32/libelf.so.0 base-compat-shlib compat,pic
+./usr/lib/o32/libelf.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libevent.so.3.2 base-compat-shlib compat,pic
+./usr/lib/o32/libfetch.so.3 base-compat-shlib compat,pic
+./usr/lib/o32/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/o32/libform.so.6 base-compat-shlib compat,pic
./usr/lib/o32/libform.so.6.0 base-compat-shlib compat,pic
./usr/lib/o32/libgcc_s.so.1 base-compat-shlib compat,pic
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64 Fri Dec 03 20:51:21 2010 +0000
+++ b/distrib/sets/lists/base/md.amd64 Fri Dec 03 21:38:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.101 2010/12/02 14:54:43 christos Exp $
+# $NetBSD: md.amd64,v 1.102 2010/12/03 21:38:48 plunky Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -52,6 +52,10 @@
./usr/lib/i386/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
./usr/lib/i386/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic
./usr/lib/i386/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
+./usr/lib/i386/libamu.so.4 base-compat-shlib compat,pic
+./usr/lib/i386/libamu.so.4.0 base-compat-shlib compat,pic
+./usr/lib/i386/libarchive.so.3 base-compat-shlib compat,pic
+./usr/lib/i386/libarchive.so.3.1 base-compat-shlib compat,pic
./usr/lib/i386/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libbfd.so.11 base-compat-shlib compat,pic,binutils
@@ -78,10 +82,18 @@
./usr/lib/i386/libdes.so.8.1 base-compat-shlib compat,pic
./usr/lib/i386/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/i386/libdns.so.5.2 base-compat-shlib compat,pic
+./usr/lib/i386/libdns_sd.so.0 base-compat-shlib compat,pic,mdns
+./usr/lib/i386/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns
+./usr/lib/i386/libdwarf.so.0 base-compat-shlib compat,pic
+./usr/lib/i386/libdwarf.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/libedit.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libedit.so.3.0 base-compat-shlib compat,pic
+./usr/lib/i386/libelf.so.0 base-compat-shlib compat,pic
+./usr/lib/i386/libelf.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libevent.so.3.2 base-compat-shlib compat,pic
+./usr/lib/i386/libfetch.so.3 base-compat-shlib compat,pic
+./usr/lib/i386/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/i386/libform.so.6 base-compat-shlib compat,pic
./usr/lib/i386/libform.so.6.0 base-compat-shlib compat,pic
./usr/lib/i386/libgcc_s.so.1 base-compat-shlib compat,pic
diff -r 40a02b8a2ef3 -r bd0f7f29ad7a distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64 Fri Dec 03 20:51:21 2010 +0000
+++ b/distrib/sets/lists/base/md.sparc64 Fri Dec 03 21:38:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.95 2010/12/02 14:54:43 christos Exp $
+# $NetBSD: md.sparc64,v 1.96 2010/12/03 21:38:48 plunky Exp $
Home |
Main Index |
Thread Index |
Old Index