Author: des
Date: Tue Sep 10 18:40:43 2013
New Revision: 255455
URL: http://svnweb.freebsd.org/changeset/base/255455
Log:
Clean up the Kerberos build by turning libheimipcc and libheimipcs into
private shared libraries, instead of hacked-together archives of PIC
objects. This makes it possible to build a static libkrb5 that works.
Reviewed by: stas
Approved by: re (gjb)
Modified:
head/kerberos5/Makefile.inc
head/kerberos5/lib/libheimipcc/Makefile
head/kerberos5/lib/libheimipcs/Makefile
head/kerberos5/lib/libkrb5/Makefile
head/kerberos5/libexec/digest-service/Makefile
head/kerberos5/libexec/kcm/Makefile
head/share/mk/bsd.libnames.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/kerberos5/Makefile.inc
==============================================================================
--- head/kerberos5/Makefile.inc Tue Sep 10 18:34:38 2013 (r255454)
+++ head/kerberos5/Makefile.inc Tue Sep 10 18:40:43 2013 (r255455)
@@ -14,8 +14,6 @@ LDAPCFLAGS= -I${OPENLDAPBASE}/include -D
LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
.endif
-LIBHEIMIPCC= ${.OBJDIR}/../../lib/libheimipcc/libheimipcc.a
-LIBHEIMIPCS= ${.OBJDIR}/../../lib/libheimipcs/libheimipcs.a
LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a
LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a
Modified: head/kerberos5/lib/libheimipcc/Makefile
==============================================================================
--- head/kerberos5/lib/libheimipcc/Makefile Tue Sep 10 18:34:38 2013
(r255454)
+++ head/kerberos5/lib/libheimipcc/Makefile Tue Sep 10 18:40:43 2013
(r255455)
@@ -1,7 +1,7 @@
#$FreeBSD$
LIB= heimipcc
-INTERNALLIB=
+PRIVATELIB=
LDADD= -lheimbase -lroken -lpthread
DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD}
@@ -9,7 +9,6 @@ SRCS= \
client.c \
common.c
-CFLAGS+= -DPIC ${PICFLAG}
CFLAGS+= -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/base \
-I${KRB5DIR}/lib/ipc
Modified: head/kerberos5/lib/libheimipcs/Makefile
==============================================================================
--- head/kerberos5/lib/libheimipcs/Makefile Tue Sep 10 18:34:38 2013
(r255454)
+++ head/kerberos5/lib/libheimipcs/Makefile Tue Sep 10 18:40:43 2013
(r255455)
@@ -1,7 +1,7 @@
#$FreeBSD$
LIB= heimipcs
-INTERNALLIB=
+PRIVATELIB=
LDADD= -lheimbase -lroken
LDFLAGS= -pthread
DPADD= ${LIBHEIMBASE} ${LIBROKEN}
@@ -10,7 +10,6 @@ SRCS= \
server.c \
common.c
-CFLAGS+= -DPIC ${PICFLAG}
CFLAGS+= -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/base \
-I${KRB5DIR}/lib/ipc -I.
Modified: head/kerberos5/lib/libkrb5/Makefile
==============================================================================
--- head/kerberos5/lib/libkrb5/Makefile Tue Sep 10 18:34:38 2013
(r255454)
+++ head/kerberos5/lib/libkrb5/Makefile Tue Sep 10 18:40:43 2013
(r255455)
@@ -3,8 +3,9 @@
LIB= krb5
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
-LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase
${LIBHEIMIPCC}
+LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase
-lheimipcc
DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509}
${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
+USEPRIVATELIB= heimipcc
INCS= heim_err.h \
heim_threads.h \
Modified: head/kerberos5/libexec/digest-service/Makefile
==============================================================================
--- head/kerberos5/libexec/digest-service/Makefile Tue Sep 10 18:34:38
2013 (r255454)
+++ head/kerberos5/libexec/digest-service/Makefile Tue Sep 10 18:40:43
2013 (r255455)
@@ -8,10 +8,11 @@ CFLAGS+= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/ipc \
-I${KRB5DIR}/lib/wind \
-I${KRB5DIR}/lib/roken
-DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1}
${LIBCRYPTO} \
- ${LIBCRYPT} ${LIBVERS}
-LDADD= -lhdb -lkdc ${LIBHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
+DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
+ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
+LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
${LIBVERS} -lheimntlm
+USEPRIVATELIB= heimipcs
.include <bsd.prog.mk>
Modified: head/kerberos5/libexec/kcm/Makefile
==============================================================================
--- head/kerberos5/libexec/kcm/Makefile Tue Sep 10 18:34:38 2013
(r255454)
+++ head/kerberos5/libexec/kcm/Makefile Tue Sep 10 18:40:43 2013
(r255455)
@@ -21,8 +21,9 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DI
-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
-LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LIBHEIMIPCS} \
+LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \
-lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
+USEPRIVATELIB= heimipcs
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk Tue Sep 10 18:34:38 2013
(r255454)
+++ head/share/mk/bsd.libnames.mk Tue Sep 10 18:40:43 2013
(r255455)
@@ -65,6 +65,8 @@ LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/lib
LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a
LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a
LIBHEIMBASE?= ${DESTDIR}${LIBDIR}/libheimbase.a
+LIBHEIMIPCC?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcc.a
+LIBHEIMIPCS?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcs.a
LIBHEIMNTLM?= ${DESTDIR}${LIBDIR}/libheimntlm.a
LIBHEIMSQLITE?= ${DESTDIR}${LIBDIR}/libheimsqlite.a
LIBHX509?= ${DESTDIR}${LIBDIR}/libhx509.a
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Sep 10 18:34:38
2013 (r255454)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Sep 10 18:40:43
2013 (r255455)
@@ -2548,6 +2548,14 @@ OLD_FILES+=usr/lib/pam_krb5.so
OLD_LIBS+=usr/lib/pam_krb5.so.5
OLD_FILES+=usr/lib/pam_ksu.so
OLD_LIBS+=usr/lib/pam_ksu.so.5
+OLD_FILES+=usr/lib/private/libheimipcc.a
+OLD_FILES+=usr/lib/private/libheimipcc.so
+OLD_LIBS+=usr/lib/private/libheimipcc.so.11
+OLD_FILES+=usr/lib/private/libheimipcc_p.a
+OLD_FILES+=usr/lib/private/libheimipcs.a
+OLD_FILES+=usr/lib/private/libheimipcs.so
+OLD_LIBS+=usr/lib/private/libheimipcs.so.11
+OLD_FILES+=usr/lib/private/libheimipcs_p.a
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
OLD_FILES+=usr/lib32/libasn1.a
OLD_FILES+=usr/lib32/libasn1.so
@@ -2617,6 +2625,14 @@ OLD_FILES+=usr/lib32/pam_krb5.so
OLD_LIBS+=usr/lib32/pam_krb5.so.5
OLD_FILES+=usr/lib32/pam_ksu.so
OLD_LIBS+=usr/lib32/pam_ksu.so.5
+OLD_FILES+=usr/lib32/private/libheimipcc.a
+OLD_FILES+=usr/lib32/private/libheimipcc.so
+OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
+OLD_FILES+=usr/lib32/private/libheimipcc_p.a
+OLD_FILES+=usr/lib32/private/libheimipcs.a
+OLD_FILES+=usr/lib32/private/libheimipcs.so
+OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
+OLD_FILES+=usr/lib32/private/libheimipcs_p.a
.endif
OLD_FILES+=usr/libexec/digest-service
OLD_FILES+=usr/libexec/hprop
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
