Skip to content

Commit 1ac6ea8

Browse files
Chuck SilversChuck Silvers
Chuck Silvers
authored and
Chuck Silvers
committed
kerberos5, libcom_err, others: append to LDFLAGS instead of replacing
Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D49548
1 parent c5773d3 commit 1ac6ea8

File tree

30 files changed

+30
-30
lines changed

30 files changed

+30
-30
lines changed

‎kerberos5/lib/libasn1/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= asn1
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
66
LIBADD= com_err roken
77
VERSION_MAP= ${.CURDIR}/version.map

‎kerberos5/lib/libgssapi_krb5/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= gssapi_krb5
4-
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
4+
LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined
55
LIBADD= gssapi krb5 crypto roken asn1 com_err
66
SHLIB_MAJOR= 10
77

‎kerberos5/lib/libgssapi_ntlm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= gssapi_ntlm
4-
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
4+
LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined
55
LIBADD= crypto gssapi krb5 heimntlm roken
66
SHLIB_MAJOR= 10
77

‎kerberos5/lib/libgssapi_spnego/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= gssapi_spnego
4-
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
4+
LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined
55
LIBADD= gssapi heimbase asn1 roken
66
SHLIB_MAJOR= 10
77

‎kerberos5/lib/libhdb/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= hdb
4-
LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS}
4+
LDFLAGS+= -Wl,--no-undefined ${LDAPLDFLAGS}
55
VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map
66
LIBADD= asn1 com_err krb5 roken sqlite3
77
LDADD= ${LDAPLDADD}

‎kerberos5/lib/libheimbase/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= heimbase
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
LIBADD= pthread
66
VERSION_MAP= ${KRB5DIR}/base/version-script.map
77

‎kerberos5/lib/libheimntlm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= heimntlm
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
LIBADD= crypto com_err krb5 roken
66
SRCS= ntlm.c ntlm_err.c ntlm_err.h
77
INCS= heimntlm.h heimntlm-protos.h ntlm_err.h

‎kerberos5/lib/libhx509/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= hx509
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
66
LIBADD= asn1 com_err crypto roken wind
77

‎kerberos5/lib/libkadm5clnt/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= kadm5clnt
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
LIBADD= com_err krb5 roken
66

77
INCS= admin.h \

‎kerberos5/lib/libkadm5srv/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= kadm5srv
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
LIBADD= com_err hdb krb5 roken
66
VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
77
MAN= kadm5_pwcheck.3

‎kerberos5/lib/libkafs5/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= kafs5
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
LIBADD= asn1 krb5 roken
66
INCS= kafs.h
77
MAN= kafs5.3

‎kerberos5/lib/libkdc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= kdc
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
66
LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto
77

‎kerberos5/lib/libkrb5/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= krb5
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
66
LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
77

‎kerberos5/lib/libwind/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE= kerberos-lib
22

33
LIB= wind
4-
LDFLAGS= -Wl,--no-undefined
4+
LDFLAGS+= -Wl,--no-undefined
55
VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
66
LIBADD= com_err roken
77

‎kerberos5/libexec/digest-service/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \
1010
-I${KRB5DIR}/lib/roken \
1111
-I${SRCTOP}/contrib/com_err
1212
LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
13-
LDFLAGS=${LDAPLDFLAGS}
13+
LDFLAGS+=${LDAPLDFLAGS}
1414

1515
.include <bsd.prog.mk>
1616

‎kerberos5/libexec/hprop/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
1414
LIBADD= hdb krb5 roken vers
1515
DPADD= ${LDAPDPADD}
1616
LDADD= ${LDAPLDADD}
17-
LDFLAGS=${LDAPLDFLAGS}
17+
LDFLAGS+=${LDAPLDFLAGS}
1818

1919
.include <bsd.prog.mk>
2020

‎kerberos5/libexec/hpropd/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
77
LIBADD= hdb krb5 roken vers
88
DPADD= ${LDAPDPADD}
99
LDADD= ${LDAPLDADD}
10-
LDFLAGS=${LDAPLDFLAGS}
10+
LDFLAGS+=${LDAPLDFLAGS}
1111

1212
.include <bsd.prog.mk>
1313

‎kerberos5/libexec/ipropd-master/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
88
LIBADD= kadm5srv hdb krb5 roken vers
99
DPADD= ${LDAPDPADD}
1010
LDADD= ${LDAPLDADD}
11-
LDFLAGS=${LDAPLDFLAGS}
11+
LDFLAGS+=${LDAPLDFLAGS}
1212

1313
.include <bsd.prog.mk>
1414

‎kerberos5/libexec/ipropd-slave/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
88
LIBADD= kadm5srv hdb krb5 roken vers
99
DPADD= ${LDAPDPADD}
1010
LDADD= ${LDAPLDADD}
11-
LDFLAGS=${LDAPLDFLAGS}
11+
LDFLAGS+=${LDAPLDFLAGS}
1212

1313
.include <bsd.prog.mk>
1414

‎kerberos5/libexec/kadmind/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
1212
LIBADD= kadm5srv gssapi hdb krb5 roken vers
1313
DPADD= ${LDAPDPADD}
1414
LDADD= ${LDAPLDADD}
15-
LDFLAGS=${LDAPLDFLAGS}
15+
LDFLAGS+=${LDAPLDFLAGS}
1616

1717
.include <bsd.prog.mk>
1818

‎kerberos5/libexec/kcm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CFLAGS+="-DKRB5_DEPRECATED_FUNCTION(X)="
2424
LIBADD= krb5 roken heimntlm heimipcs crypto
2525
DPADD= ${LDAPDPADD}
2626
LDADD= ${LIBVERS} ${LDAPLDADD}
27-
LDFLAGS=${LDAPLDFLAGS}
27+
LDFLAGS+=${LDAPLDFLAGS}
2828

2929
.include <bsd.prog.mk>
3030

‎kerberos5/libexec/kdc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SRCS= config.c \
1111
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
1212
-I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
1313
LIBADD= kdc hdb krb5 roken crypt vers
14-
LDFLAGS=${LDAPLDFLAGS}
14+
LDFLAGS+=${LDAPLDFLAGS}
1515

1616
.include <bsd.prog.mk>
1717

‎kerberos5/libexec/kpasswdd/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS}
66
LIBADD= kadm5srv hdb krb5 roken vers asn1
77
DPADD= ${LDAPDPADD}
88
LDADD= ${LDAPLDADD}
9-
LDFLAGS=${LDAPLDFLAGS}
9+
LDFLAGS+=${LDAPLDFLAGS}
1010

1111
.include <bsd.prog.mk>
1212

‎kerberos5/usr.bin/kadmin/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
2929
LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
3030
DPADD= ${LDAPDPADD}
3131
LDADD= ${LDAPLDADD}
32-
LDFLAGS=${LDAPLDFLAGS}
32+
LDFLAGS+=${LDAPLDFLAGS}
3333

3434
CLEANFILES= kadmin-commands.h kadmin-commands.c
3535

‎kerberos5/usr.bin/kpasswd/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PACKAGE= kerberos
33
PROG= kpasswd
44
CFLAGS+=-I${KRB5DIR}/lib/roken
55
LIBADD= hdb krb5 roken vers crypto
6-
LDFLAGS=${LDAPLDFLAGS}
6+
LDFLAGS+=${LDAPLDFLAGS}
77

88
.include <bsd.prog.mk>
99

‎kerberos5/usr.sbin/iprop-log/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \
99
-I${KRB5DIR}/lib/sl \
1010
-I.
1111
LIBADD= kadm5srv hdb krb5 roken edit sl vers
12-
LDFLAGS=${LDAPLDFLAGS}
12+
LDFLAGS+=${LDAPLDFLAGS}
1313

1414
CLEANFILES= iprop-commands.h iprop-commands.c
1515

‎kerberos5/usr.sbin/kstash/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
77
LIBADD= hdb krb5 crypto vers
88
DPADD= ${LDAPDPADD}
99
LDADD= ${LDAPLDADD}
10-
LDFLAGS=${LDAPLDFLAGS}
10+
LDFLAGS+=${LDAPLDFLAGS}
1111

1212
.include <bsd.prog.mk>
1313

‎lib/libcom_err/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MAN= com_err.3
77
COM_ERRDIR= ${SRCTOP}/contrib/com_err
88
CFLAGS+= -I${COM_ERRDIR}
99

10-
LDFLAGS= -Wl,--no-undefined
10+
LDFLAGS+= -Wl,--no-undefined
1111
VERSION_MAP= ${COM_ERRDIR}/version-script.map
1212

1313
.include <bsd.lib.mk>

‎tools/regression/tls/ttls3/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
all: ttls3
22

3-
LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined
3+
LDFLAGS+=-shared -Bsymbolic --allow-shlib-undefined
44
CFLAGS+= -lpthread
55
CFLAGS+= -Wl,--rpath=${.OBJDIR}
66

‎tools/tools/net80211/w00t/Makefile.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
W00T= ../libw00t
22
# NB: we get crc32 from -lz
33
DPADD= ${W00T}/libw00t.a
4-
LDFLAGS= -L${W00T}
4+
LDFLAGS+= -L${W00T}
55
LDADD= -lw00t
66
LIBADD+= crypto z
77

0 commit comments

Comments
 (0)