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.
This commit is contained in:
plunky 2010-12-03 21:38:46 +00:00
parent 65b45bb0d8
commit f33b316b63
19 changed files with 295 additions and 136 deletions

View File

@ -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 @@ BUILDTARGETS+= do-libgcc
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/crtstuff
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 @@ do-${dir:S/\//-/g}: .PHONY .MAKE
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

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@ -50,6 +50,10 @@
./usr/lib/sparc/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
./usr/lib/sparc/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic
./usr/lib/sparc/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic
./usr/lib/sparc/libamu.so.4 base-compat-shlib compat,pic
./usr/lib/sparc/libamu.so.4.0 base-compat-shlib compat,pic
./usr/lib/sparc/libarchive.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libarchive.so.3.1 base-compat-shlib compat,pic
./usr/lib/sparc/libasn1.so.8 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libbfd.so.11 base-compat-shlib compat,pic,binutils
@ -76,10 +80,18 @@
./usr/lib/sparc/libdes.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/sparc/libdns.so.5.2 base-compat-shlib compat,pic
./usr/lib/sparc/libdns_sd.so.0 base-compat-shlib compat,pic,mdns
./usr/lib/sparc/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns
./usr/lib/sparc/libdwarf.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/libdwarf.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/libedit.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libedit.so.3.0 base-compat-shlib compat,pic
./usr/lib/sparc/libelf.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/libelf.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/sparc/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/sparc/libform.so.6 base-compat-shlib compat,pic
./usr/lib/sparc/libform.so.6.0 base-compat-shlib compat,pic
./usr/lib/sparc/libgcc_s.so.1 base-compat-shlib compat,pic

View File

@ -1,4 +1,4 @@
# $NetBSD: ad.mips64eb,v 1.13 2010/11/06 09:40:31 plunky Exp $
# $NetBSD: ad.mips64eb,v 1.14 2010/12/03 21:38:48 plunky Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@ -160,6 +160,10 @@
./usr/lib/64/i18n/libmapper_zone.so base-sys-shlib compat,pic
./usr/lib/64/i18n/libmapper_zone_p.a comp-obsolete obsolete
./usr/lib/64/i18n/libmapper_zone_pic.a comp-obsolete obsolete
./usr/lib/64/libarchive.a comp-c-lib compat
./usr/lib/64/libarchive.so base-sys-shlib compat,pic
./usr/lib/64/libarchive_p.a comp-c-proflib compat,profile
./usr/lib/64/libarchive_pic.a comp-c-piclib compat,pic
./usr/lib/64/libasn1.a comp-c-lib compat,kerberos
./usr/lib/64/libasn1.so base-sys-shlib compat,pic,kerberos
./usr/lib/64/libasn1_p.a comp-c-proflib compat,profile,kerberos
@ -227,14 +231,30 @@
./usr/lib/64/libdns.so base-sys-shlib compat,pic
./usr/lib/64/libdns_p.a comp-c-proflib compat,profile
./usr/lib/64/libdns_pic.a comp-c-piclib compat,pic
./usr/lib/64/libdns_sd.a comp-c-lib compat,mdns
./usr/lib/64/libdns_sd.so base-mdns-shlib compat,pic,mdns
./usr/lib/64/libdns_sd_p.a comp-c-proflib compat,profile,mdns
./usr/lib/64/libdns_sd_pic.a comp-c-piclib compat,pic,mdns
./usr/lib/64/libdwarf.a comp-c-lib compat
./usr/lib/64/libdwarf.so base-sys-shlib compat,pic
./usr/lib/64/libdwarf_p.a comp-c-proflib compat,profile
./usr/lib/64/libdwarf_pic.a comp-c-piclib compat,pic
./usr/lib/64/libedit.a comp-c-lib compat
./usr/lib/64/libedit.so base-sys-shlib compat,pic
./usr/lib/64/libedit_p.a comp-c-proflib compat,profile
./usr/lib/64/libedit_pic.a comp-c-piclib compat,pic
./usr/lib/64/libelf.a comp-c-lib compat
./usr/lib/64/libelf.so base-sys-shlib compat,pic
./usr/lib/64/libelf_p.a comp-c-proflib compat,profile
./usr/lib/64/libelf_pic.a comp-c-piclib compat,pic
./usr/lib/64/libevent.a comp-c-lib compat
./usr/lib/64/libevent.so base-sys-shlib compat,pic
./usr/lib/64/libevent_p.a comp-c-proflib compat,profile
./usr/lib/64/libevent_pic.a comp-c-piclib compat,pic
./usr/lib/64/libfetch.a comp-c-lib compat
./usr/lib/64/libfetch.so base-sys-shlib compat,pic
./usr/lib/64/libfetch_p.a comp-c-proflib compat,profile
./usr/lib/64/libfetch_pic.a comp-c-piclib compat,pic
./usr/lib/64/libfl.a comp-c-lib compat
./usr/lib/64/libfl_p.a comp-c-proflib compat,profile
./usr/lib/64/libform.a comp-c-lib compat
@ -641,6 +661,10 @@
./usr/lib/o32/i18n/libmapper_zone.so base-sys-shlib compat,pic
./usr/lib/o32/i18n/libmapper_zone_p.a comp-obsolete obsolete
./usr/lib/o32/i18n/libmapper_zone_pic.a comp-obsolete obsolete
./usr/lib/o32/libarchive.a comp-c-lib compat
./usr/lib/o32/libarchive.so base-sys-shlib compat,pic
./usr/lib/o32/libarchive_p.a comp-c-proflib compat,profile
./usr/lib/o32/libarchive_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libasn1.a comp-c-lib compat,kerberos
./usr/lib/o32/libasn1.so base-sys-shlib compat,pic,kerberos
./usr/lib/o32/libasn1_p.a comp-c-proflib compat,profile,kerberos
@ -708,14 +732,30 @@
./usr/lib/o32/libdns.so base-sys-shlib compat,pic
./usr/lib/o32/libdns_p.a comp-c-proflib compat,profile
./usr/lib/o32/libdns_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libdns_sd.a comp-c-lib compat,mdns
./usr/lib/o32/libdns_sd.so base-mdns-shlib compat,pic,mdns
./usr/lib/o32/libdns_sd_p.a comp-c-proflib compat,profile,mdns
./usr/lib/o32/libdns_sd_pic.a comp-c-piclib compat,pic,mdns
./usr/lib/o32/libdwarf.a comp-c-lib compat
./usr/lib/o32/libdwarf.so base-sys-shlib compat,pic
./usr/lib/o32/libdwarf_p.a comp-c-proflib compat,profile
./usr/lib/o32/libdwarf_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libedit.a comp-c-lib compat
./usr/lib/o32/libedit.so base-sys-shlib compat,pic
./usr/lib/o32/libedit_p.a comp-c-proflib compat,profile
./usr/lib/o32/libedit_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libelf.a comp-c-lib compat
./usr/lib/o32/libelf.so base-sys-shlib compat,pic
./usr/lib/o32/libelf_p.a comp-c-proflib compat,profile
./usr/lib/o32/libelf_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libevent.a comp-c-lib compat
./usr/lib/o32/libevent.so base-sys-shlib compat,pic
./usr/lib/o32/libevent_p.a comp-c-proflib compat,profile
./usr/lib/o32/libevent_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libfetch.a comp-c-lib compat
./usr/lib/o32/libfetch.so base-sys-shlib compat,pic
./usr/lib/o32/libfetch_p.a comp-c-proflib compat,profile
./usr/lib/o32/libfetch_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libfl.a comp-c-lib compat
./usr/lib/o32/libfl_p.a comp-c-proflib compat,profile
./usr/lib/o32/libform.a comp-c-lib compat

View File

@ -1,4 +1,4 @@
# $NetBSD: ad.mips64el,v 1.13 2010/11/06 09:40:31 plunky Exp $
# $NetBSD: ad.mips64el,v 1.14 2010/12/03 21:38:48 plunky Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@ -160,6 +160,10 @@
./usr/lib/64/i18n/libmapper_zone.so base-sys-shlib compat,pic
./usr/lib/64/i18n/libmapper_zone_p.a comp-obsolete obsolete
./usr/lib/64/i18n/libmapper_zone_pic.a comp-obsolete obsolete
./usr/lib/64/libarchive.a comp-c-lib compat
./usr/lib/64/libarchive.so base-sys-shlib compat,pic
./usr/lib/64/libarchive_p.a comp-c-proflib compat,profile
./usr/lib/64/libarchive_pic.a comp-c-piclib compat,pic
./usr/lib/64/libasn1.a comp-c-lib compat,kerberos
./usr/lib/64/libasn1.so base-sys-shlib compat,pic,kerberos
./usr/lib/64/libasn1_p.a comp-c-proflib compat,profile,kerberos
@ -227,14 +231,30 @@
./usr/lib/64/libdns.so base-sys-shlib compat,pic
./usr/lib/64/libdns_p.a comp-c-proflib compat,profile
./usr/lib/64/libdns_pic.a comp-c-piclib compat,pic
./usr/lib/64/libdns_sd.a comp-c-lib compat,mdns
./usr/lib/64/libdns_sd.so base-mdns-shlib compat,pic,mdns
./usr/lib/64/libdns_sd_p.a comp-c-proflib compat,profile,mdns
./usr/lib/64/libdns_sd_pic.a comp-c-piclib compat,pic,mdns
./usr/lib/64/libdwarf.a comp-c-lib compat
./usr/lib/64/libdwarf.so base-sys-shlib compat,pic
./usr/lib/64/libdwarf_p.a comp-c-proflib compat,profile
./usr/lib/64/libdwarf_pic.a comp-c-piclib compat,pic
./usr/lib/64/libedit.a comp-c-lib compat
./usr/lib/64/libedit.so base-sys-shlib compat,pic
./usr/lib/64/libedit_p.a comp-c-proflib compat,profile
./usr/lib/64/libedit_pic.a comp-c-piclib compat,pic
./usr/lib/64/libelf.a comp-c-lib compat
./usr/lib/64/libelf.so base-sys-shlib compat,pic
./usr/lib/64/libelf_p.a comp-c-proflib compat,profile
./usr/lib/64/libelf_pic.a comp-c-piclib compat,pic
./usr/lib/64/libevent.a comp-c-lib compat
./usr/lib/64/libevent.so base-sys-shlib compat,pic
./usr/lib/64/libevent_p.a comp-c-proflib compat,profile
./usr/lib/64/libevent_pic.a comp-c-piclib compat,pic
./usr/lib/64/libfetch.a comp-c-lib compat
./usr/lib/64/libfetch.so base-sys-shlib compat,pic
./usr/lib/64/libfetch_p.a comp-c-proflib compat,profile
./usr/lib/64/libfetch_pic.a comp-c-piclib compat,pic
./usr/lib/64/libfl.a comp-c-lib compat
./usr/lib/64/libfl_p.a comp-c-proflib compat,profile
./usr/lib/64/libform.a comp-c-lib compat
@ -641,6 +661,10 @@
./usr/lib/o32/i18n/libmapper_zone.so base-sys-shlib compat,pic
./usr/lib/o32/i18n/libmapper_zone_p.a comp-obsolete obsolete
./usr/lib/o32/i18n/libmapper_zone_pic.a comp-obsolete obsolete
./usr/lib/o32/libarchive.a comp-c-lib compat
./usr/lib/o32/libarchive.so base-sys-shlib compat,pic
./usr/lib/o32/libarchive_p.a comp-c-proflib compat,profile
./usr/lib/o32/libarchive_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libasn1.a comp-c-lib compat,kerberos
./usr/lib/o32/libasn1.so base-sys-shlib compat,pic,kerberos
./usr/lib/o32/libasn1_p.a comp-c-proflib compat,profile,kerberos
@ -708,14 +732,30 @@
./usr/lib/o32/libdns.so base-sys-shlib compat,pic
./usr/lib/o32/libdns_p.a comp-c-proflib compat,profile
./usr/lib/o32/libdns_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libdns_sd.a comp-c-lib compat,mdns
./usr/lib/o32/libdns_sd.so base-mdns-shlib compat,pic,mdns
./usr/lib/o32/libdns_sd_p.a comp-c-proflib compat,profile,mdns
./usr/lib/o32/libdns_sd_pic.a comp-c-piclib compat,pic,mdns
./usr/lib/o32/libdwarf.a comp-c-lib compat
./usr/lib/o32/libdwarf.so base-sys-shlib compat,pic
./usr/lib/o32/libdwarf_p.a comp-c-proflib compat,profile
./usr/lib/o32/libdwarf_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libedit.a comp-c-lib compat
./usr/lib/o32/libedit.so base-sys-shlib compat,pic
./usr/lib/o32/libedit_p.a comp-c-proflib compat,profile
./usr/lib/o32/libedit_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libelf.a comp-c-lib compat
./usr/lib/o32/libelf.so base-sys-shlib compat,pic
./usr/lib/o32/libelf_p.a comp-c-proflib compat,profile
./usr/lib/o32/libelf_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libevent.a comp-c-lib compat
./usr/lib/o32/libevent.so base-sys-shlib compat,pic
./usr/lib/o32/libevent_p.a comp-c-proflib compat,profile
./usr/lib/o32/libevent_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libfetch.a comp-c-lib compat
./usr/lib/o32/libfetch.so base-sys-shlib compat,pic
./usr/lib/o32/libfetch_p.a comp-c-proflib compat,profile
./usr/lib/o32/libfetch_pic.a comp-c-piclib compat,pic
./usr/lib/o32/libfl.a comp-c-lib compat
./usr/lib/o32/libfl_p.a comp-c-proflib compat,profile
./usr/lib/o32/libform.a comp-c-lib compat

View File

@ -1,4 +1,4 @@
# $NetBSD: md.amd64,v 1.81 2010/12/02 14:54:44 christos Exp $
# $NetBSD: md.amd64,v 1.82 2010/12/03 21:38:48 plunky Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@ -356,6 +356,11 @@
./usr/lib/i386/i18n/libmapper_zone_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/i18n/libmapper_zone_p.a comp-obsolete obsolete
./usr/lib/i386/i18n/libmapper_zone_pic.a comp-obsolete obsolete
./usr/lib/i386/libarchive.a comp-c-lib compat
./usr/lib/i386/libarchive.so comp-sys-shlib compat,pic
./usr/lib/i386/libarchive_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libarchive_p.a comp-c-proflib compat,profile
./usr/lib/i386/libarchive_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libasn1.a comp-c-lib compat,kerberos
./usr/lib/i386/libasn1.so comp-sys-shlib compat,pic,kerberos
./usr/lib/i386/libasn1_g.a comp-c-proflib compat,debuglib,kerberos
@ -439,16 +444,36 @@
./usr/lib/i386/libdns_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libdns_p.a comp-c-proflib compat,profile
./usr/lib/i386/libdns_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libdns_sd.a comp-c-lib compat,mdns
./usr/lib/i386/libdns_sd.so comp-mdns-shlib compat,pic,mdns
./usr/lib/i386/libdns_sd_g.a comp-c-proflib compat,debuglib,mdns
./usr/lib/i386/libdns_sd_p.a comp-c-proflib compat,profile,mdns
./usr/lib/i386/libdns_sd_pic.a comp-c-piclib compat,pic,mdns
./usr/lib/i386/libdwarf.a comp-c-lib compat
./usr/lib/i386/libdwarf.so comp-sys-shlib compat,pic
./usr/lib/i386/libdwarf_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libdwarf_p.a comp-c-proflib compat,profile
./usr/lib/i386/libdwarf_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libedit.a comp-c-lib compat
./usr/lib/i386/libedit.so comp-sys-shlib compat,pic
./usr/lib/i386/libedit_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libedit_p.a comp-c-proflib compat,profile
./usr/lib/i386/libedit_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libelf.a comp-c-lib compat
./usr/lib/i386/libelf.so comp-sys-shlib compat,pic
./usr/lib/i386/libelf_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libelf_p.a comp-c-proflib compat,profile
./usr/lib/i386/libelf_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libevent.a comp-c-lib compat
./usr/lib/i386/libevent.so comp-sys-shlib compat,pic
./usr/lib/i386/libevent_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libevent_p.a comp-c-proflib compat,profile
./usr/lib/i386/libevent_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libfetch.a comp-c-lib compat
./usr/lib/i386/libfetch.so comp-sys-shlib compat,pic
./usr/lib/i386/libfetch_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libfetch_p.a comp-c-proflib compat,profile
./usr/lib/i386/libfetch_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libfl.a comp-c-lib compat
./usr/lib/i386/libfl_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libfl_p.a comp-c-proflib compat,profile
@ -862,6 +887,8 @@
./usr/libdata/debug/usr/lib/i386/i18n/libmapper_serial.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/i18n/libmapper_std.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/i18n/libmapper_zone.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libamu.so.4.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libarchive.so.3.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libasn1.so.8.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/i386/libbfd.so.11.0.debug comp-compat-shlib compat,pic,binutils,debug
./usr/libdata/debug/usr/lib/i386/libbind9.so.5.2.debug comp-compat-shlib compat,pic,debug
@ -875,8 +902,12 @@
./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libdes.so.8.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libdns.so.5.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libdns_sd.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libdwarf.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libedit.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libelf.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libevent.so.3.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libfetch.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libform.so.6.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libgcc_s.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libgnumalloc.so.1.0.debug comp-compat-shlib compat,pic,debug

View File

@ -1,4 +1,4 @@
# $NetBSD: md.sparc64,v 1.71 2010/12/02 14:54:44 christos Exp $
# $NetBSD: md.sparc64,v 1.72 2010/12/03 21:38:48 plunky Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@ -233,6 +233,10 @@
./usr/lib/sparc/i18n/libmapper_zone.so base-sys-shlib compat,pic
./usr/lib/sparc/i18n/libmapper_zone_p.a comp-obsolete obsolete
./usr/lib/sparc/i18n/libmapper_zone_pic.a comp-obsolete obsolete
./usr/lib/sparc/libarchive.a comp-c-lib compat
./usr/lib/sparc/libarchive.so base-sys-shlib compat,pic
./usr/lib/sparc/libarchive_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libarchive_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libasn1.a comp-c-lib compat,kerberos
./usr/lib/sparc/libasn1.so base-sys-shlib compat,pic,kerberos
./usr/lib/sparc/libasn1_p.a comp-c-proflib compat,profile,kerberos
@ -300,14 +304,30 @@
./usr/lib/sparc/libdns.so base-sys-shlib compat,pic
./usr/lib/sparc/libdns_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libdns_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libdns_sd.a comp-c-lib compat,mdns
./usr/lib/sparc/libdns_sd.so base-mdns-shlib compat,pic,mdns
./usr/lib/sparc/libdns_sd_p.a comp-c-proflib compat,profile,mdns
./usr/lib/sparc/libdns_sd_pic.a comp-c-piclib compat,pic,mdns
./usr/lib/sparc/libdwarf.a comp-c-lib compat
./usr/lib/sparc/libdwarf.so base-sys-shlib compat,pic
./usr/lib/sparc/libdwarf_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libdwarf_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libedit.a comp-c-lib compat
./usr/lib/sparc/libedit.so base-sys-shlib compat,pic
./usr/lib/sparc/libedit_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libedit_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libelf.a comp-c-lib compat
./usr/lib/sparc/libelf.so base-sys-shlib compat,pic
./usr/lib/sparc/libelf_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libelf_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libevent.a comp-c-lib compat
./usr/lib/sparc/libevent.so base-sys-shlib compat,pic
./usr/lib/sparc/libevent_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libevent_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libfetch.a comp-c-lib compat
./usr/lib/sparc/libfetch.so base-sys-shlib compat,pic
./usr/lib/sparc/libfetch_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libfetch_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/libfl.a comp-c-lib compat
./usr/lib/sparc/libfl_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libform.a comp-c-lib compat
@ -637,6 +657,8 @@
./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_serial.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_std.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_zone.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libamu.so.4.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libarchive.so.3.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libasn1.so.8.0.debug comp-compat-shlib compat,pic,debug,kerberos
./usr/libdata/debug/usr/lib/sparc/libbfd.so.11.0.debug comp-compat-shlib compat,pic,binutils,debug
./usr/libdata/debug/usr/lib/sparc/libbind9.so.5.2.debug comp-compat-shlib compat,pic,debug
@ -650,8 +672,12 @@
./usr/libdata/debug/usr/lib/sparc/libcurses.so.7.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libdes.so.8.1.debug comp-compat-shlib compat,pic,debug,crypto
./usr/libdata/debug/usr/lib/sparc/libdns.so.5.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libdns_sd.so.0.0.debug comp-compat-shlib compat,pic,debug,mdns
./usr/libdata/debug/usr/lib/sparc/libdwarf.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libedit.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libelf.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libevent.so.3.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libfetch.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libform.so.6.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libgcc_s.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libgnumalloc.so.1.0.debug comp-compat-shlib compat,pic,debug

4
external/Makefile vendored
View File

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.14 2010/11/03 18:52:44 christos Exp $
SUBDIR+= lib .WAIT
# $NetBSD: Makefile,v 1.15 2010/12/03 21:38:46 plunky Exp $
SUBDIR+= apache2 atheros bsd intel-fw-eula intel-fw-public gpl2 gpl3 historical
SUBDIR+= ibm-public intel-public public-domain cddl mit

View File

@ -1,10 +1,10 @@
#!/bin/sh
# $NetBSD: prepare-import.sh,v 1.1 2009/12/23 00:06:53 darran Exp $
# $NetBSD: prepare-import.sh,v 1.2 2010/12/03 21:38:48 plunky Exp $
# Copy the FreeBSD src/lib/libdwarf directory contents to dist. Run
# this script and you're done.
#
# lib/ is built as SUBDIR from external/lib/Makefile.
# lib/ is built as SUBDIR from lib/Makefile.
#
# Use the following template to import
# cvs import src/external/bsd/libdwarf/dist FreeBSD FreeBSD-X-Y-Z

View File

@ -1,10 +1,10 @@
#!/bin/sh
# $NetBSD: prepare-import.sh,v 1.2 2009/12/29 16:56:25 thorpej Exp $
# $NetBSD: prepare-import.sh,v 1.3 2010/12/03 21:38:49 plunky Exp $
# Copy the FreeBSD src/lib/libelf directory contents to dist. Run
# this script and you're done.
#
# lib/ is built as SUBDIR from external/lib/Makefile.
# lib/ is built as SUBDIR from lib/Makefile.
#
# Use the following template to import
# cvs import src/external/bsd/libelf/dist FreeBSD FreeBSD-X-Y-Z

View File

@ -1,11 +1,11 @@
#!/bin/sh
# $NetBSD: prepare-import.sh,v 1.1 2009/11/02 10:03:56 plunky Exp $
# $NetBSD: prepare-import.sh,v 1.2 2010/12/03 21:38:49 plunky Exp $
# Extract the new tarball and rename the libevent-X.Y.Z directory
# to dist. Run this script and check for additional files and
# directories to prune, only relevant content is included.
#
# lib/ is built as SUBDIR from external/lib/Makefile, and
# lib/ is built as SUBDIR from lib/Makefile, and
# the regression tests are used from tests/lib/libevent
#
# Use the following template to import

42
external/lib/Makefile vendored
View File

@ -1,42 +0,0 @@
# $NetBSD: Makefile,v 1.17 2010/11/02 16:34:35 joerg Exp $
#
# This Makefile exists to provide a single point to build
# all libraries provided by external packages that may
# be used by other applications in the system.
#
.include <bsd.own.mk>
.if (${MKATF} != "no")
SUBDIR+= ../bsd/atf/lib
.endif
.if (${MKMDNS} != "no")
SUBDIR+= ../apache2/mDNSResponder/lib
.endif
.if (${MKCRYPTO} != "no")
SUBDIR+= ../../crypto/external/lib .WAIT
.endif
.if (${MKLDAP} != "no")
SUBDIR+= ../bsd/openldap/lib
.endif
.if (${MKISCSI} != "no")
SUBDIR+= ../bsd/iscsi/lib # depends on libpthread
.endif
SUBDIR+= ../public-domain/xz/lib .WAIT
SUBDIR+= ../bsd/fetch/lib
SUBDIR+= ../bsd/libarchive/lib
SUBDIR+= ../bsd/libevent/lib
SUBDIR+= ../bsd/libelf/lib
SUBDIR+= ../bsd/libdwarf/lib
SUBDIR+= ../bsd/am-utils/lib
SUBDIR+= ../bsd/bind/lib
SUBDIR+= ../bsd/file/lib
.include <bsd.subdir.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.16 2009/11/08 17:01:58 pgoyette Exp $
# $NetBSD: Makefile,v 1.17 2010/12/03 21:38:47 plunky Exp $
SUBDIR+= lib .WAIT usr.bin
SUBDIR+= usr.bin
# Speedup stubs for some subtrees that don't need to run these rules
includes-libexec:

View File

@ -1,17 +0,0 @@
# $NetBSD: Makefile,v 1.47 2010/11/28 18:40:55 skrll Exp $
.include <bsd.own.mk>
.if ${MKGCC} != "no"
.if ${USE_COMPILERCRTSTUFF} == "yes"
SUBDIR+= crtstuff4
.endif
SUBDIR+= libgcc4 libobjc4
.if ${MKCXX} != "no"
SUBDIR+= libsupc++4 libstdc++-v3_4
.endif
.endif
SUBDIR+= libmalloc
.include <bsd.subdir.mk>

View File

@ -1,9 +1,27 @@
# $NetBSD: Makefile,v 1.154 2010/11/21 03:43:39 christos Exp $
# $NetBSD: Makefile,v 1.155 2010/12/03 21:38:47 plunky Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
SUBDIR= csu libc .WAIT libarch \
SUBDIR= csu
.if (${MKGCC} != "no")
.if (${USE_COMPILERCRTSTUFF} == "yes")
SUBDIR+= ../gnu/lib/crtstuff4
.endif
SUBDIR+= ../gnu/lib/libgcc4
.endif
SUBDIR+= libc
SUBDIR+= .WAIT
#
# The SUBDIRs above are included here for completeness but should be built
# and installed prior to make(dependall) in this file, as libraries listed
# below will depend on versions from DESTDIR only.
#
SUBDIR+=libarch \
libbsdmalloc libbluetooth libbz2 \
libcompat libcrypt \
libintl libkvm libm \
@ -11,8 +29,30 @@ SUBDIR= csu libc .WAIT libarch \
libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
librumpclient libterminfo libusbhid libutil libwrap liby libz
SUBDIR+=../external/bsd/flex/lib
SUBDIR+=../external/mit/lua/lib
.if (${MKMDNS} != "no")
SUBDIR+= ../external/apache2/mDNSResponder/lib
.endif
SUBDIR+= ../external/bsd/am-utils/lib
.if (${MKATF} != "no")
SUBDIR+= ../external/bsd/atf/lib
.endif
SUBDIR+= ../external/bsd/flex/lib
SUBDIR+= ../external/bsd/libdwarf/lib
SUBDIR+= ../external/bsd/libelf/lib
SUBDIR+= ../external/bsd/libevent/lib
SUBDIR+= ../external/mit/lua/lib
SUBDIR+= ../external/public-domain/xz/lib
SUBDIR+= ../gnu/lib/libmalloc
.if (${MKGCC} != "no")
SUBDIR+= ../gnu/lib/libobjc4
.endif
# libcurses needs libtermlib
SUBDIR+= .WAIT libcurses
@ -73,10 +113,29 @@ SUBDIR+= .WAIT
SUBDIR+= ../crypto/external/bsd/netpgp/lib
.endif
SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
SUBDIR+= ../external/bsd/file/lib # depends on libz
.if (${MKISCSI} != "no")
SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread
.endif
SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
.if (${MKLDAP} != "no")
SUBDIR+= ../external/bsd/openldap/lib
.endif
.if (${MKBINUTILS} != "no")
SUBDIR+= ../external/gpl3/binutils/lib # libbfd depends on libz
.endif
.if (${MKGCC} != "no" && ${MKCXX} != "no")
SUBDIR+= ../gnu/lib/libstdc++-v3_4 # depends on libm
SUBDIR+= ../gnu/lib/libsupc++4
.endif
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT