Page MenuHomeFreeBSD
Files F151213283

D49548.id152778.diff
No OneTemporary
Actions

D49548.id152778.diff
View Options

diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -10,7 +10,7 @@
-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
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -14,7 +14,7 @@
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
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -7,7 +7,7 @@
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
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -8,7 +8,7 @@
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
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -8,7 +8,7 @@
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
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -12,7 +12,7 @@
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
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -24,7 +24,7 @@
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
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -11,7 +11,7 @@
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
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -6,7 +6,7 @@
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
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -29,7 +29,7 @@
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
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -3,7 +3,7 @@
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
--- a/kerberos5/usr.sbin/iprop-log/Makefile
+++ b/kerberos5/usr.sbin/iprop-log/Makefile
@@ -9,7 +9,7 @@
-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
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -7,7 +7,7 @@
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
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -7,7 +7,7 @@
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
--- 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
--- 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

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 9:29 PM (10 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31050322
Default Alt Text
D49548.id152778.diff (10 KB)

Event Timeline