Page MenuHomeFreeBSD
Files F170668903

D1209.id2509.diff
No OneTemporary
Actions

D1209.id2509.diff
View Options

Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -7,7 +7,382 @@
.error src.libnames.mk cannot be included directly.
.endif
-ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+.include <src.opts.mk>
+
+ROOTSRCDIR= ${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${ROOTSRCDIR}
+_PRIVATELIBS= ucl bsdstat ssh ldns atf_c atf_cxx unbound
+
+.for _l in ${LIBADD}
+DPADD+= ${DPADD_${_l}}
+LDADD+= ${LDADD_${_l}}
+.if ${_PRIVATELIBS:M${_l}}
+USEPRIVATELIB+= ${_l}
+.endif
+.endfor
+
+DPADD_archive= ${LIBARCHIVE}
+LDADD_archive= -larchive
+.if defined(NO_SHARED)
+DPADD_archive+= ${DPADD_z} ${DPADD_bz2} ${DPADD_lzma} ${DPADD_bsdxml}
+LDADD_archive+= ${LDADD_z} ${LDADD_bz2} ${LDADD_lzma} ${LDADD_bsdxml}
+.if ${MK_OPENSSL} != "no"
+DPADD_archive+= ${DPADD_crypto}
+LDADD_archive+= ${LDADD_crypto}
+.else
+DPADD_archive+= ${DPADD_md}
+LDADD_archive+= ${LDADD_md}
+.endif
+.endif
+
+DPADD_z= ${LIBZ}
+LDADD_z= -lz
+
+DPADD_bz2= ${LIBBZ2}
+LDADD_bz2= -lbz2
+
+DPADD_lzma= ${LIBLZMA}
+LDADD_lzma= -llzma
+
+DPADD_bsdxml= ${LIBBSDXML}
+LDADD_bsdxml= -lbsdxml
+
+DPADD_crypto= ${LIBCRYPTO}
+LDADD_crypto= -lcrypto
+
+DPADD_ssl= ${LIBSSL}
+LDADD_ssl= -lssl
+
+.if defined(NO_SHARED)
+DPADD_ssl+= ${DPADD_crypto}
+LDADD_ssl+= ${LDADD_crypto}
+.endif
+
+DPADD_md= ${LIBMD}
+LDADD_md= -lmd
+
+DPADD_pam= ${LIBPAM}
+LDADD_pam= -lpam
+
+DPADD_ssh= ${LIBSSH}
+LDADD_ssh= ${LDSSH}
+
+.if defined(NO_SHARED)
+DPADD_ssh+= ${DPADD_crypto} ${DPADD_crypt}
+LDADD_ssh+= ${LDADD_crypto} ${LDADD_crypt}
+.endif
+
+DPADD_crypt= ${LIBCRYPT}
+LDADD_crypt= -lcrypt
+
+DPADD_termcapw= ${LIBTERMCAPW}
+LDADD_termcapw= -ltermcapw
+
+DPADD_util= ${LIBUTIL}
+LDADD_util= -lutil
+
+DPADD_kvm= ${LIBKVM}
+LDADD_kvm= -lkvm
+
+DPADD_m= ${LIBM}
+LDADD_m= -lm
+
+DPADD_jail= ${LIBJAIL}
+LDADD_jail= -ljail
+
+DPADD_sm= ${LIBSM}
+LDADD_sm= ${LDSM}
+
+DPADD_edit= ${LIBEDIT}
+LDADD_edit= -ledit
+.if defined(NO_SHARED)
+DPADD_edit+= ${DPADD_ncursesw}
+LDADD_edit+= ${LDADD_ncursesw}
+.endif
+
+DPADD_ncursesw= ${LIBNCURSESW}
+LDADD_ncursesw= -lncursesw
+
+DPADD_bsnmp= ${LIBBSNMP}
+LDADD_bsnmp= -lbsnmp
+.if defined(NO_SHARED)
+.if ${MK_OPENSSL} != "no"
+DPADD_bsnmp+= ${DPADD_crypto}
+LDADD_bsnmp+= ${LDADD_crypto}
+.endif
+.endif
+
+DPADD_geom= ${LIBGEOM}
+LDADD_geom= -lgeom
+.if defined(NO_SHARED)
+DPADD_geom+= ${DPADD_bsdxml} ${DPADD_sbuf}
+LDADD_geom+= ${LDADD_bsdxml} ${LDADD_sbuf}
+.endif
+
+DPADD_sbuf= ${LIBSBUF}
+LDADD_sbuf= -lsbuf
+
+DPADD_cam= ${LIBCAM}
+LDADD_cam= -lcam
+.if defined(NO_SHARED)
+DPADD_cam+= ${DPADD_sbuf}
+LDADD_sbuf+= -lsbuf
+.endif
+
+DPADD_casper= ${LIBCASPER}
+LDADD_casper= -lcasper
+.if defined(NO_SHARED)
+DPADD_casper+= ${DPADD_capsicum} ${DPADD_nv} ${DPADD_pjdlog}
+LDADD_capser+= ${LDADD_capsicum} ${LDADD_nv} ${LDADD_pjdlog}
+.endif
+
+DPADD_capsicum= ${LIBCAPSICUM}
+LDADD_capsicum= -lcapsicum
+.if defined(NO_SHARED)
+DPADD_capsicum+= ${DPADD_nv}
+LDADD_capsicum+= ${LDADD_nv}
+.endif
+
+DPADD_nv= ${LIBNV}
+LDADD_nv= -lnv
+
+DPADD_pjdlog= ${LIBPJDLOG}
+LDADD_pjdlog= -lpjdlog
+
+.if defined(NO_SHARED)
+DPADD_pjdlog+= ${DPADD_util}
+LDADD_pjdlog+= ${LDADD_util}
+.endif
+
+DPADD_opie= ${LIBOPIE}
+LDADD_opie= -lopie
+.if defined(NO_SHARED)
+DPADD_opie+= ${DPADD_md}
+LDADD_opie+= ${LDADD_md}
+.endif
+
+DPADD_ufs= ${LIBUFS}
+LDADD_ufs= -lufs
+
+DPADD_l= ${LIBL}
+LDADD_l= -ll
+
+DPADD_y= ${LIBY}
+LDADD_y= -ly
+
+DPADD_ipsec= ${LIBIPSEC}
+LDADD_ipsec= -lipsec
+
+DPADD_pcap= ${LIBPCAP}
+LDADD_pcap= -lpcap
+
+DPADD_alias= ${LIBALIAS}
+LDADD_alias= -lalias
+
+DPADD_nandfs= ${LIBNANDFS}
+LDADD_nandfs= -lnandfs
+
+DPADD_kiconv= ${LIBKICONV}
+LDADD_kiconv= -lkiconv
+
+DPADD_usb= ${LIBUSB}
+LDADD_usb= -lusb
+.if defined(NO_SHARED)
+DPADD_usb+= ${DPADD_pthread}
+LDADD_usb+= ${LDADD_pthread}
+.endif
+
+DPADD_unbound= ${LIBUNBOUND}
+LDADD_unbound= ${LDUNBOUND}
+.if defined(NO_SHARED)
+LDADD_unbound= ${LIBUNBOUND}
+DPADD_unbound+= ${DPADD_pthread}
+LDADD_unbound+= ${LDADD_pthread}
+.endif
+
+DPADD_ulog= ${LIBULOG}
+LDADD_ulog= -lulog
+
+DPADD_tacplus= ${LIBTACPLUS}
+LDADD_tacplus= -ltacplus
+
+DPADD_stdthreads= ${LIBSTDTHREADS}
+LDADD_stdthreads= -lstdthreads
+
+DPADD_smb= ${LIBSMB}
+LDADD_smb= -lsmb
+
+DPADD_rt= ${LIBRT}
+LDADD_rt= -lrt
+.if defined(NO_SHARED)
+DPADD_rt+= ${DPADD_pthread}
+LDADD_rt+= ${LDADD_rt}
+.endif
+
+DPADD_gssapi= ${LIBGSSAPI}
+LDADD_gssapi= -lgssapi
+
+DPADD_rpcsec_gss= ${LIBRPCSEC_GSS}
+LDADD_rpcsec_gss= -lrpcsec_gss
+
+DPADD_radius= ${LIBRADIUS}
+LDADD_radius= -lradius
+.if defined(NO_SHARED)
+.if ${MK_OPENSSL} == "no"
+DPADD_radius+= ${DPADD_md}
+LDADD_radius+= ${LDADD_md}
+.else
+DPADD_radius+= ${DPADD_crypto}
+LDADD_radius+= ${LDADD_crypto}
+.endif
+.endif
+
+DPADD_procstat= ${LIBPROCSTAT}
+LDADD_procstat= -lprocstat
+.if defined(NO_SHARED)
+DPADD_procstat+= ${DPADD_kvm} ${DPADD_util} ${DPADD_elf}
+LDADD_procstat+= ${LDADD_kvm} ${LDADD_util} ${LDADD_elf}
+.endif
+DPADD_elf= ${LIBELF}
+LDADD_elf= -lelf
+
+DPADD_cxxrt= ${LIBCXXRT}
+LDADD_cxxrt= -lcxxrt
+
+DPADD_cft= ${LIBCFT}
+LDADD_cft= -lcft
+
+DPADD_supcplusplus= ${LIBSUPCPLUSPLUS}
+LDADD_supcplusplus= -lsupc++
+
+DPADD_proc= ${LIBPROC}
+LDADD_proc= -lproc
+.if defined(NO_SHARED)
+.if ${MK_CXX} == "yes"
+.if ${MK_LIBCPLUSPLUS} != "no"
+DPADD_proc+= ${DPADD_cxxrt}
+LDADD_proc+= ${LDADD_cxxrt}
+.else
+DPADD_proc+= ${DPADD_supcplusplus}
+LDADD_proc+= ${LDADD_supcplusplus}
+.endif
+.endif
+.if ${MK_CDDL} != "no"
+DPADD_proc+= ${DPADD_cft}
+LDADD_proc+= ${LDADD_cft}
+.endif
+.endif
+
+DPADD_mp= ${LIBMP}
+LDADD_mp= -lmp
+.if defined(NO_SHARED)
+DPADD_mp+= ${DPADD_crypto}
+LDADD_mp+= ${LDADD_crypto}
+.endif
+
+DPADD_memstat= ${LIBMEMSTAT}
+LDADD_memstat= -lmemstat
+.if defined(NO_SHARED)
+DPADD_memstat+= ${DPADD_kvm}
+LDADD_memstat+= ${LDADD_kvm}
+.endif
+
+DPADD_magic= ${LIBMAGIC}
+LDADD_magic= -lmagic
+.if defined(NO_SHARED)
+DPADD_magic+= ${DPADD_z}
+LDADD_magic+= ${LDADD_z}
+.endif
+
+DPADD_ldns= ${LIBLDNS}
+LDADD_ldns= ${LDLDNS}
+.if defined(NO_SHARED)
+DPADD_ldns+= ${DPADD_crypto}
+LDADD_ldns+= ${LDADD_crypto}
+.endif
+
+DPADD_fetch= ${LIBFETCH}
+LDADD_fetch= -lfetch
+.if defined(NO_SHARED)
+.if ${MK_OPENSSL} != "no"
+DPADD_fetch+= ${DPADD_ssl} ${DPADD_crypto}
+LDADD_fetch+= ${LDADD_ssl} ${LDADD_crypto}
+.else
+DPADD_fetch+= ${DPADD_md}
+LDADD_fetch+= ${LDADD_md}
+.endif
+.endif
+
+DPADD_execinfo= ${LIBEXECINFO}
+LDADD_execinfo= -lexecinfo
+.if defined(NO_SHARED)
+DPADD_execinfo+= ${DPADD_elf}
+LDADD_execinfo+= ${LDADD_elf}
+.endif
+
+DPADD_dwarf= ${LIBDWARF}
+LDADD_dwarf= -ldwarf
+.if defined(NO_SHARED)
+DPADD_dwarf+= ${DPADD_elf}
+LDADD_dwarf+= ${LDADD_elf}
+.endif
+
+DPADD_dpv= ${LIBDPV}
+LDADD_dpv= -ldpv
+.if defined(NO_SHARED)
+DPADD_dpv+= ${DPADD_dialog} ${DPADD_figpar} ${DPADD_util}
+LDADD_dpv+= ${LDADD_dialog} ${LDADD_figpar} ${LDADD_util}
+.endif
+
+DPADD_dialog= ${LIBDIALOG}
+LDADD_dialog= -ldialog
+.if defined(NO_SHARED)
+DPADD_dialog+= ${DPADD_ncursesw} ${DPADD_m}
+LDADD_dialog+= ${LDADD_ncursesw} ${LDADD_m}
+.endif
+
+DPADD_figpar= ${LIBFIGIPAR}
+LDADD_figpar= -lfigpar
+
+DPADD_cuse= ${LIBCUSE}
+LDADD_cuse= -lcuse
+.if defined(NO_SHARED)
+DPADD_cuse+= ${DPADD_pthread}
+LDADD_cuse+= ${LDADD_pthread}
+.endif
+
+DPADD_atf_c= ${LIBATF_C}
+LDADD_atf_c= ${LDATF_C}
+
+DPADD_atf_cxx= ${LIBATF_CXX}
+LDADD_atf_cxx= ${LDATF_CXX}
+.if defined(NO_SHARED)
+DPADD_atf_cxx+= ${DPADD_atf_c}
+LDADD_atf_cxx+= ${LDADD_atf_c}
+.endif
+
+DPADD_ucl= ${LIBUCL}
+.if defined(NO_SHARED)
+LDADD_ucl= ${LIBUCL}
+.else
+LDADD_ucl= ${LDUCL}
+.endif
+# ucl needs and exposes libm
+DPADD_ucl+= ${DPADD_m}
+LDADD_ucl+= ${LDADD_m}
+
+DPADD_wrap= ${LIBWRAP}
+LDADD_wrap= -lwrap
+
+DPADD_devstat= ${LIBDEVSTAT}
+LDADD_devstat= -ldevstat
+.if defined(NO_SHARED)
+DPADD_devstat+= ${DPADD_kvm}
+LDADD_devstat+= ${LDADD_kvm}
+.endif
+
+DPADD_event= ${LIBEVENT}
+LDADD_event= ${LDEVENT}
LIBATF_CDIR= ${ROOTOBJDIR}/lib/atf/libatf-c
LDATF_C?= ${LIBATF_CDIR}/libatf-c.so
@@ -22,7 +397,7 @@
LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a
LIBEVENTDIR= ${ROOTOBJDIR}/lib/libevent
-LDEVENT?= ${LIBEVENTDIR}/libevent.so
+LDEVENT?= ${LIBEVENTDIR}/libevent.a
LIBEVENT?= ${LIBEVENTDIR}/libevent.a
LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc
@@ -56,3 +431,7 @@
LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash
LDOHASH?= ${LIBOHASHDIR}/libohash.a
LIBOHASH?= ${LIBOHASHDIR}/libohash.a
+
+LIBSMDIR= ${ROOTOBJDIR}/lib/libsm
+LDSM?= ${LIBSMDIR}/libsm.a
+LIBSM?= ${LIBSMDIR}/libsm.a
Index: share/mk/suite.test.mk
===================================================================
--- share/mk/suite.test.mk
+++ share/mk/suite.test.mk
@@ -9,8 +9,9 @@
.endif
# Directory in which to install tests defined by the current Makefile.
-# Makefiles have to override this to point to a subdirectory of TESTSBASE.
-TESTSDIR?= .
+# It is derived of TESTSBASE and the relative directory from the top of where
+# the Makefile is located.
+TESTSDIR?= ${TESTSBASE}${.CURDIR:H:S/${.MAKE.MAKEFILES:M*/suite.test.mk:H:H:H}//}
# Name of the test suite these tests belong to. Should rarely be changed for
# Makefiles built into the FreeBSD src tree.

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 6, 10:32 PM (8 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38423556
Default Alt Text
D1209.id2509.diff (8 KB)

Event Timeline