Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

Browse Source 
- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
Lionel Sambuc
2013-12-06 12:04:52 +01:00
parent ff10274392
commit 84d9c625bf
4655 changed files with 379317 additions and 151059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
lib/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.189 2012/09/16 13:47:41 rmind Exp $
# $NetBSD: Makefile,v 1.209 2013/11/28 12:08:56 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -29,6 +29,46 @@ SUBDIR+= .WAIT
SUBDIR+= libc
SUBDIR+= .WAIT
.if defined(__MINIX)
SUBDIR+= libasyn \
libaudiodriver \
libbdev \
libblockdriver \
libchardriver \
libcompat_minix \
libddekit \
libdevman \
libexec \
libfetch \
libinputdriver \
libminc \
libminixfs \
libmthread \
libnetdriver \
libsffs \
libtimers \
libusb \
libvtreefs
.if (${MKLWIP} == "yes")
SUBDIR+= liblwip \
libnetsock
.endif
.if (${MACHINE_ARCH} == "i386")
SUBDIR+= libhgfs \
libvassert \
libvboxfs \
libvirtio
.endif
.if (${MACHINE_ARCH} == "earm")
SUBDIR+= libclkconf \
libgpio \
libi2cdriver
.endif
.endif # defined(__MINIX)
#
# The SUBDIRs above are included here for completeness but should be built
# and installed prior to make(dependall) in this file, as libraries listed
@@ -37,26 +77,25 @@ SUBDIR+= .WAIT
#SUBDIR+= i18n_module
SUBDIR+= libcompat_minix libblockdriver libchardriver \
libnetdriver libm libtimers libutil \
libz libfetch libvtreefs libaudiodriver libmthread \
libexec libdevman libusb libasyn librmt \
libddekit libminixfs libbdev libelf libminc libcrypt libterminfo \
libutil libbz2 libprop \
libpuffs libsffs libinputdriver
SUBDIR+= \
libbz2 \
libcrypt \
libm \
libprop \
libpuffs librmt \
libterminfo \
libutil libz
.if (${MKLWIP} == "yes")
SUBDIR += liblwip libnetsock
.if !defined(BSD_MK_COMPAT_FILE)
#SUBDIR+= libkern
.endif
.if (${MACHINE_ARCH} == "i386")
SUBDIR += libvassert libhgfs libvboxfs libvirtio
.if (${MACHINE_CPU} == "arm")
LIBC_MACHINE_ARCH?=${MACHINE_ARCH}
.if empty(LIBC_MACHINE_ARCH:M*hf*)
SUBDIR+= libc_vfp
.endif
.if (${MACHINE_ARCH} == "earm")
SUBDIR += libclkconf libgpio libi2cdriver
.endif
.if (${MKRUMP} != "no")
SUBDIR+= librumpclient
.endif
@@ -64,10 +103,6 @@ SUBDIR+= librumpclient
SUBDIR+= libskey
.endif
.if (${MKCRYPTO} != "no")
SUBDIR+= ../crypto/external/bsd/netpgp/libmj
.endif
.if (${MKMDNS} != "no")
SUBDIR+= ../external/apache2/mDNSResponder/lib
.endif
@@ -76,13 +111,10 @@ SUBDIR+= ../external/apache2/mDNSResponder/lib
SUBDIR+= ../external/bsd/flex/lib
#SUBDIR+= ../external/bsd/tre/lib
#SUBDIR+= ../external/bsd/libdwarf/lib
#SUBDIR+= ../external/bsd/libelf/lib
#SUBDIR+= ../external/bsd/libevent/lib
SUBDIR+= ../external/bsd/libelf/lib
#SUBDIR+= ../external/bsd/liblzf/lib
#SUBDIR+= ../external/bsd/libpcap/lib
SUBDIR+= ../external/mit/lua/lib
#SUBDIR+= ../external/mit/expat/lib
SUBDIR+= ../external/public-domain/sqlite/lib
@@ -94,18 +126,20 @@ SUBDIR+= ../external/public-domain/xz/lib
. if ${HAVE_GCC} == 4
#SUBDIR+= ../gnu/lib/libobjc4
. else
#SUBDIR+= ../external/gpl3/gcc/lib/libobjc
#SUBDIR+= ../external/gpl3/gcc/lib/libgomp
. if !defined(__MINIX) || ${MKGCCCMDS} == "yes"
SUBDIR+= ../external/gpl3/gcc/lib/libobjc
SUBDIR+= ../external/gpl3/gcc/lib/libgomp
. endif # !defined(__MINIX) || ${MKGCCCMDS} == "yes"
. endif
# LSC: Replaced __MINIX test with MKGCCCMDS, as we do not want gcc by default
# nor the libraries, but we still want toretain the possibility of
# nor the libraries, but we still want to retain the possibility of
# installing GCC from the base system.
. if ${HAVE_GCC} >= 45 && !defined(MLIBDIR) && ${MKGCCCMDS} == "yes"
# Should probably move GMP, MPFR and MPC builds into the GCC >= 4.5
# specific build area, but we get better parallelism this way.
SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
SUBDIR+= ../external/lgpl3/mpc/lib/libmpc
. endif
.endif
@@ -116,14 +150,22 @@ SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
#==================== 1st library dependency barrier ====================
SUBDIR+= .WAIT
.if (${MKCRYPTO} != "no")
SUBDIR+= ../crypto/external/bsd/netpgp/libmj
SUBDIR+= ../crypto/external/bsd/netpgp/lib/verify # depends on libz
.endif
#SUBDIR+= ../external/bsd/libdwarf/lib # depends on libelf
SUBDIR+= ../external/mit/lua/lib # depends on libm
SUBDIR+= libcurses # depends on libterminfo
#SUBDIR+= libdm # depends on libprop
SUBDIR+= libedit # depends on libterminfo
#SUBDIR+= libexecinfo # depends on libelf
SUBDIR+= libexecinfo # depends on libelf
#SUBDIR+= libppath # depends on libprop
#SUBDIR+= libperfuse # depends on libpuffs
#SUBDIR+= libquota # depends on libprop and librpcsvc
SUBDIR+= librefuse # depends on libpuffs
#SUBDIR+= libisns # depends on libpthread
.if (${MKRUMP} != "no")
SUBDIR+= librumpuser # depends on libpthread
SUBDIR+= librumphijack # depends on librumpclient and libpthread
@@ -131,7 +173,6 @@ SUBDIR+= librumphijack # depends on librumpclient and libpthread
.if (${MKNPF} != "no")
SUBDIR+= libnpf # depends on libprop
#SUBDIR+= npf
.endif
.if (${MKCRYPTO} != "no")
@@ -154,7 +195,11 @@ SUBDIR+= ../external/gpl2/lvm2/lib # depends on libprop
SUBDIR+= ../external/gpl3/binutils/lib # libbfd depends on libz
.endif
.if (${MKGCC} != "no" && ${MKCXX} != "no")
.if (${MKLIBCXX} != "no")
SUBDIR+= ../external/bsd/libc++
.endif
.if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
.if (defined(__MINIX) && ${MKGCCCMDS} == "yes")
. if ${HAVE_GCC} == 4
SUBDIR+= ../gnu/lib/libstdc++-v3_4 # depends on libm
@@ -169,7 +214,10 @@ SUBDIR+= ../external/gpl3/gcc/lib/libsupc++
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
.if (defined(__MINIX) && ${MKGCCCMDS} == "yes")
.if (${MKNPF} != "no")
SUBDIR+= npf # depends on libnpf
.endif
.if (${MKATF} != "no")
SUBDIR+= ../external/bsd/atf/lib # depends on libstdc++
.endif
@@ -177,7 +225,6 @@ SUBDIR+= ../external/bsd/atf/lib # depends on libstdc++
.if (${MKKYUA} != "no")
SUBDIR+= ../external/bsd/lutok/lib # depends on lua and libstdc++
.endif
.endif # (defined(__MINIX) && ${MKGCCCMDS} == "yes")
SUBDIR+= libform # depends on libcurses
SUBDIR+= libmenu # depends on libcurses
@@ -196,7 +243,7 @@ SUBDIR+= ../crypto/external/bsd/openssh/lib # depends on libcrypto, libz
SUBDIR+= ../crypto/external/bsd/netpgp/lib # depends on libcrypto, ...
.endif
#SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
#SUBDIR+= ../external/bsd/libevent/lib # depends on libcrypto
#SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
.if (${MKLDAP} != "no")
@@ -206,6 +253,8 @@ SUBDIR+= ../external/bsd/openldap/lib # depends on libcrypto, ...
#==================== 3rd library dependency barrier ====================
SUBDIR+= .WAIT
#SUBDIR+= ../external/bsd/bind/lib # depends on heimdal, libcrypto
.if (${MKRUMP} != "no")
SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
@@ -220,7 +269,13 @@ SUBDIR+= libpam # depends on heimdal
SUBDIR+= ../crypto/external/bsd/libsaslc # depends on heimdal, openssl
.endif
#SUBDIR+= ../external/bsd/mdocml/lib
.if ${MKSLJIT} != "no"
SUBDIR+= ../external/bsd/sljit/lib
SUBDIR+= .WAIT
SUBDIR+= libbpfjit
.endif
SUBDIR+= ../external/bsd/mdocml/lib
.if (${MKRUMP} != "no")
#==================== 4th library dependency barrier ====================
@@ -228,11 +283,19 @@ SUBDIR+= .WAIT
SUBDIR+= libukfs # depends on librumpvfs, librump
.if (${MKTPM} != "no")
SUBDIR+= ../crypto/external/cpl/trousers/lib
.endif
#==================== 5th library dependency barrier ====================
SUBDIR+= .WAIT
SUBDIR+= libp2k # depends on libukfs, librumpvfs, libpuffs
.if (${MKTPM} != "no")
SUBDIR+= ../crypto/external/cpl/tpm-tools/lib # depends on trousers
.endif
.if !defined(BSD_MK_COMPAT_FILE)
SUBDIR+= ../sys/rump/dev/lib
SUBDIR+= ../sys/rump/fs/lib
@@ -242,32 +305,7 @@ SUBDIR+= ../sys/rump/net/lib
.endif
# Lua bindings come last, they might depend on anything
#SUBDIR+= lua
#
# build_install logic for src/Makefile.
# Compute a list of subdirectories delimited by .WAIT.
# Run "make dependall && make install" for all subdirectories in a group
# concurrently, but wait after each group.
#
SUBDIR_GROUPS= 1
CUR_GROUP:= 1
.for dir in ${SUBDIR}
. if ${dir} == ".WAIT"
CUR_GROUP:= ${CUR_GROUP}1
SUBDIR_GROUPS:= ${SUBDIR_GROUPS} ${CUR_GROUP}
. else
SUBDIR_GROUP.${CUR_GROUP}+= ${dir}
.endif
.endfor
build_install:
.for group in ${SUBDIR_GROUPS}
. if !empty(SUBDIR_GROUP.${group})
${MAKEDIRTARGET} . ${SUBDIR_GROUP.${group}:C/^/dependall-/}
${MAKEDIRTARGET} . ${SUBDIR_GROUP.${group}:C/^/install-/}
. endif
.endfor
SUBDIR+= lua
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>