Remove libulog from the bootstrap again.
libulog now only provides functions that are used by various packages from the ports tree, namely the libutempter ones. There is no reason to link it into the crunch/fixit binaries anymore.
This commit is contained in:
+1
-1
@@ -1114,7 +1114,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
|
|||||||
lib/libkiconv lib/libkvm lib/libmd \
|
lib/libkiconv lib/libkvm lib/libmd \
|
||||||
lib/ncurses/ncurses lib/ncurses/ncursesw \
|
lib/ncurses/ncurses lib/ncurses/ncursesw \
|
||||||
lib/libopie lib/libpam ${_lib_libthr} \
|
lib/libopie lib/libpam ${_lib_libthr} \
|
||||||
lib/libradius lib/libsbuf lib/libtacplus lib/libulog \
|
lib/libradius lib/libsbuf lib/libtacplus \
|
||||||
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
|
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
|
||||||
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
|
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
|
||||||
${_secure_lib_libssl} lib/libdwarf lib/libproc
|
${_secure_lib_libssl} lib/libdwarf lib/libproc
|
||||||
|
|||||||
+4
-5
@@ -21,7 +21,6 @@
|
|||||||
# librpcsvc must be built before libpam.
|
# librpcsvc must be built before libpam.
|
||||||
# libsbuf must be built before libcam.
|
# libsbuf must be built before libcam.
|
||||||
# libtacplus must be built before libpam.
|
# libtacplus must be built before libpam.
|
||||||
# libulog must be built before libpam.
|
|
||||||
# libutil must be built before libpam.
|
# libutil must be built before libpam.
|
||||||
# libypclnt must be built before libpam.
|
# libypclnt must be built before libpam.
|
||||||
# libgssapi must be built before librpcsec_gss
|
# libgssapi must be built before librpcsec_gss
|
||||||
@@ -31,7 +30,7 @@
|
|||||||
SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \
|
SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \
|
||||||
libmd \
|
libmd \
|
||||||
ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
|
ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
|
||||||
libtacplus libulog libutil ${_libypclnt} libalias libarchive \
|
libtacplus libutil ${_libypclnt} libalias libarchive \
|
||||||
${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
|
${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
|
||||||
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
|
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
|
||||||
libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
|
libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
|
||||||
@@ -39,9 +38,9 @@ SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \
|
|||||||
${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
|
${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
|
||||||
${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
|
${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
|
||||||
${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
|
${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
|
||||||
${_libsmdb} \
|
${_libsmdb} ${_libsmutil} libstand \
|
||||||
${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
|
${_libtelnet} ${_libthr} libthread_db libufs libugidfw libulog \
|
||||||
libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
|
${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
|
||||||
${_bind}
|
${_bind}
|
||||||
|
|
||||||
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
|
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
|
||||||
|
|||||||
@@ -46,4 +46,4 @@ progs chown
|
|||||||
progs chroot
|
progs chroot
|
||||||
ln chown chgrp
|
ln chown chgrp
|
||||||
|
|
||||||
libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil
|
libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil
|
||||||
|
|||||||
@@ -40,4 +40,4 @@ srcdirs /usr/src/usr.sbin
|
|||||||
progs chown
|
progs chown
|
||||||
ln chown chgrp
|
ln chown chgrp
|
||||||
|
|
||||||
libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil
|
libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil
|
||||||
|
|||||||
@@ -44,4 +44,4 @@ srcdirs /usr/src/usr.sbin
|
|||||||
progs chown
|
progs chown
|
||||||
ln chown chgrp
|
ln chown chgrp
|
||||||
|
|
||||||
libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil
|
libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil
|
||||||
|
|||||||
@@ -181,4 +181,3 @@ libs_so -lz
|
|||||||
libs_so -lbsdxml
|
libs_so -lbsdxml
|
||||||
libs_so -lsbuf
|
libs_so -lsbuf
|
||||||
libs_so -ljail # used by ifconfig
|
libs_so -ljail # used by ifconfig
|
||||||
libs_so -lulog # used by ifconfig
|
|
||||||
|
|||||||
@@ -189,4 +189,3 @@ libs_so -lz
|
|||||||
libs_so -lbsdxml
|
libs_so -lbsdxml
|
||||||
libs_so -lsbuf
|
libs_so -lsbuf
|
||||||
libs_so -ljail # used by ifconfig
|
libs_so -ljail # used by ifconfig
|
||||||
libs_so -lulog
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ CRUNCH_SRCDIRS+= bin
|
|||||||
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
|
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
|
||||||
ed expr getfacl hostname kenv kill ln ls mkdir mv \
|
ed expr getfacl hostname kenv kill ln ls mkdir mv \
|
||||||
pkill ps pwd realpath rm rmdir setfacl sh stty sync test
|
pkill ps pwd realpath rm rmdir setfacl sh stty sync test
|
||||||
CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lulog -lutil
|
CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
|
||||||
|
|
||||||
# Additional options for specific programs
|
# Additional options for specific programs
|
||||||
CRUNCH_ALIAS_test= [
|
CRUNCH_ALIAS_test= [
|
||||||
|
|||||||
Reference in New Issue
Block a user