The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=1ac6ea8a0251243d34f0ede2315b8f2b4393080d
commit 1ac6ea8a0251243d34f0ede2315b8f2b4393080d Author: Chuck Silvers <[email protected]> AuthorDate: 2025-04-05 21:18:35 +0000 Commit: Chuck Silvers <[email protected]> CommitDate: 2025-04-05 21:19:57 +0000 kerberos5, libcom_err, others: append to LDFLAGS instead of replacing Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D49548 --- kerberos5/lib/libasn1/Makefile | 2 +- kerberos5/lib/libgssapi_krb5/Makefile | 2 +- kerberos5/lib/libgssapi_ntlm/Makefile | 2 +- kerberos5/lib/libgssapi_spnego/Makefile | 2 +- kerberos5/lib/libhdb/Makefile | 2 +- kerberos5/lib/libheimbase/Makefile | 2 +- kerberos5/lib/libheimntlm/Makefile | 2 +- kerberos5/lib/libhx509/Makefile | 2 +- kerberos5/lib/libkadm5clnt/Makefile | 2 +- kerberos5/lib/libkadm5srv/Makefile | 2 +- kerberos5/lib/libkafs5/Makefile | 2 +- kerberos5/lib/libkdc/Makefile | 2 +- kerberos5/lib/libkrb5/Makefile | 2 +- kerberos5/lib/libwind/Makefile | 2 +- kerberos5/libexec/digest-service/Makefile | 2 +- kerberos5/libexec/hprop/Makefile | 2 +- kerberos5/libexec/hpropd/Makefile | 2 +- kerberos5/libexec/ipropd-master/Makefile | 2 +- kerberos5/libexec/ipropd-slave/Makefile | 2 +- kerberos5/libexec/kadmind/Makefile | 2 +- kerberos5/libexec/kcm/Makefile | 2 +- kerberos5/libexec/kdc/Makefile | 2 +- kerberos5/libexec/kpasswdd/Makefile | 2 +- kerberos5/usr.bin/kadmin/Makefile | 2 +- kerberos5/usr.bin/kpasswd/Makefile | 2 +- kerberos5/usr.sbin/iprop-log/Makefile | 2 +- kerberos5/usr.sbin/kstash/Makefile | 2 +- lib/libcom_err/Makefile | 2 +- tools/regression/tls/ttls3/Makefile | 2 +- tools/tools/net80211/w00t/Makefile.inc | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index 58fde4ded382..0398ed185481 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= asn1 -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h LIBADD= com_err roken VERSION_MAP= ${.CURDIR}/version.map diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile index 630cb11ad6ca..6f74f6516c4e 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= gssapi_krb5 -LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile index 8698c5c2e3e1..51da17339620 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= gssapi_ntlm -LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile index 421c3fecce7c..2cf73285cd37 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= gssapi_spnego -LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index be18779a047e..04e3a4739ef9 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= hdb -LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} +LDFLAGS+= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 LDADD= ${LDAPLDADD} diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile index e3cb2fc6c770..9870fe1d6204 100644 --- a/kerberos5/lib/libheimbase/Makefile +++ b/kerberos5/lib/libheimbase/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= heimbase -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile index f68a3d498d20..cc32e4c5e509 100644 --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= heimntlm -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined LIBADD= crypto com_err krb5 roken SRCS= ntlm.c ntlm_err.c ntlm_err.h INCS= heimntlm.h heimntlm-protos.h ntlm_err.h diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index 0e82a79d9a8a..7713b4897170 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= hx509 -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map LIBADD= asn1 com_err crypto roken wind diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile index dee95b0c8b4b..182d60c9843c 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile +++ b/kerberos5/lib/libkadm5clnt/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= kadm5clnt -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined LIBADD= com_err krb5 roken INCS= admin.h \ diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile index 9905668c529a..05006288220c 100644 --- a/kerberos5/lib/libkadm5srv/Makefile +++ b/kerberos5/lib/libkadm5srv/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= kadm5srv -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined LIBADD= com_err hdb krb5 roken VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map MAN= kadm5_pwcheck.3 diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index ba83533bd84e..91e06d5d777a 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= kafs5 -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined LIBADD= asn1 krb5 roken INCS= kafs.h MAN= kafs5.3 diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile index 58355fd6d810..72bd7d183a29 100644 --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= kdc -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/kdc/version-script.map LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index edc14556dc59..d377446cd437 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= krb5 -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile index 2ce6947dce7d..b57d62dc830f 100644 --- a/kerberos5/lib/libwind/Makefile +++ b/kerberos5/lib/libwind/Makefile @@ -1,7 +1,7 @@ PACKAGE= kerberos-lib LIB= wind -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map LIBADD= com_err roken diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index 521e3b294709..0996f8704d16 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -10,7 +10,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/roken \ -I${SRCTOP}/contrib/com_err LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index 96ac9205d040..b52ccc89e1ce 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -14,7 +14,7 @@ CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 20619c070aa8..9e2039c67a63 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -7,7 +7,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 640de69120a1..ee8e2146a716 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -8,7 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ LIBADD= kadm5srv hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 748183eb09b9..6738181a6455 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -8,7 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ LIBADD= kadm5srv hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index b228b653b021..6ffe59d6e2cf 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -12,7 +12,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ LIBADD= kadm5srv gssapi hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile index f62e39a920f4..fda4b8e367b0 100644 --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -24,7 +24,7 @@ CFLAGS+="-DKRB5_DEPRECATED_FUNCTION(X)=" LIBADD= krb5 roken heimntlm heimipcs crypto DPADD= ${LDAPDPADD} LDADD= ${LIBVERS} ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 587f850d5953..6c8f91af2631 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -11,7 +11,7 @@ SRCS= config.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS} LIBADD= kdc hdb krb5 roken crypt vers -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index 8b09c0eea5cc..8fb8a7eb0a50 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -6,7 +6,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers asn1 DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 3ff90ff1e1d9..62aca1b81a83 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -29,7 +29,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} CLEANFILES= kadmin-commands.h kadmin-commands.c diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index d8da1baadf39..659067f7ad12 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -3,7 +3,7 @@ PACKAGE= kerberos PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= hdb krb5 roken vers crypto -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile index e4e7964cd009..511b46a48b8c 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -9,7 +9,7 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/sl \ -I. LIBADD= kadm5srv hdb krb5 roken edit sl vers -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} CLEANFILES= iprop-commands.h iprop-commands.c diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index f2e2ce691cac..62ff9c70b05f 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -7,7 +7,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ LIBADD= hdb krb5 crypto vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} -LDFLAGS=${LDAPLDFLAGS} +LDFLAGS+=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index 2bfd26bae968..f070fd534469 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -7,7 +7,7 @@ MAN= com_err.3 COM_ERRDIR= ${SRCTOP}/contrib/com_err CFLAGS+= -I${COM_ERRDIR} -LDFLAGS= -Wl,--no-undefined +LDFLAGS+= -Wl,--no-undefined VERSION_MAP= ${COM_ERRDIR}/version-script.map .include <bsd.lib.mk> diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile index ef00223e4c25..03413ea8e1d6 100644 --- a/tools/regression/tls/ttls3/Makefile +++ b/tools/regression/tls/ttls3/Makefile @@ -1,6 +1,6 @@ all: ttls3 -LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined +LDFLAGS+=-shared -Bsymbolic --allow-shlib-undefined CFLAGS+= -lpthread CFLAGS+= -Wl,--rpath=${.OBJDIR} diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc index 69c06542d367..fcde408757e6 100644 --- a/tools/tools/net80211/w00t/Makefile.inc +++ b/tools/tools/net80211/w00t/Makefile.inc @@ -1,7 +1,7 @@ W00T= ../libw00t # NB: we get crc32 from -lz DPADD= ${W00T}/libw00t.a -LDFLAGS= -L${W00T} +LDFLAGS+= -L${W00T} LDADD= -lw00t LIBADD+= crypto z
