svn commit: r283160 - in head: . kerberos5/lib kerberos5/lib/libhdb kerberos5/lib/libheimsqlite
Baptiste Daroussin
bapt at FreeBSD.org
Wed May 20 18:56:31 UTC 2015
Author: bapt
Date: Wed May 20 18:56:29 2015
New Revision: 283160
URL: https://svnweb.freebsd.org/changeset/base/283160
Log:
Make kerberos use the same sqlite libraries as other sqlite consumer.
This reduces the number of copy of sqlite we have to just one and easier
tracking version of sqlite
Differential Revision: https://reviews.freebsd.org/D2443
Reviewed by: imp, stas, bjk
Deleted:
head/kerberos5/lib/libheimsqlite/
Modified:
head/Makefile.inc1
head/ObsoleteFiles.inc
head/kerberos5/lib/Makefile
head/kerberos5/lib/libhdb/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Wed May 20 18:41:54 2015 (r283159)
+++ head/Makefile.inc1 Wed May 20 18:56:29 2015 (r283160)
@@ -1679,7 +1679,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_kerberos5_lib_libhdb} \
${_kerberos5_lib_libheimbase} \
${_kerberos5_lib_libheimntlm} \
- ${_kerberos5_lib_libheimsqlite} \
+ ${_libsqlite3} \
${_kerberos5_lib_libheimipcc} \
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
@@ -1803,7 +1803,7 @@ _secure_lib= secure/lib
kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
- kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L
+ kerberos5/lib/libwind__L lib/libsqlite3__L
kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
kerberos5/lib/libroken__L lib/libcom_err__L
kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
@@ -1816,7 +1816,7 @@ kerberos5/lib/libroken__L: lib/libcrypt_
kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
kerberos5/lib/libheimbase__L: lib/libthr__L
kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
-kerberos5/lib/libheimsqlite__L: lib/libthr__L
+lib/libsqlite3__L: lib/libthr__L
.endif
.if ${MK_GSSAPI} != "no"
@@ -1832,7 +1832,7 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li
_kerberos5_lib_libhx509= kerberos5/lib/libhx509
_kerberos5_lib_libroken= kerberos5/lib/libroken
_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
+_libsqlite3= lib/libsqlite3
_kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
_kerberos5_lib_libwind= kerberos5/lib/libwind
_libcom_err= lib/libcom_err
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Wed May 20 18:41:54 2015 (r283159)
+++ head/ObsoleteFiles.inc Wed May 20 18:56:29 2015 (r283160)
@@ -38,6 +38,15 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150520
+OLD_FILES+=usr/lib/libheimsqlite.a
+OLD_FILES+=usr/lib/libheimsqlite.so
+OLD_LIBS+=usr/lib/libheimsqlite.so.11
+OLD_FILES+=usr/lib/libheimsqlite_p.a
+OLD_FILES+=usr/lib32/libheimsqlite.a
+OLD_FILES+=usr/lib32/libheimsqlite.so
+OLD_LIBS+=usr/lib32/libheimsqlite.so.11
+OLD_FILES+=usr/lib32/libheimsqlite_p.a
# 20150506
OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
# 20150504
Modified: head/kerberos5/lib/Makefile
==============================================================================
--- head/kerberos5/lib/Makefile Wed May 20 18:41:54 2015 (r283159)
+++ head/kerberos5/lib/Makefile Wed May 20 18:56:29 2015 (r283160)
@@ -3,7 +3,7 @@
SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \
- libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs
+ libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs
SUBDIR+= libkafs5 # requires krb_err.h from libkrb5
Modified: head/kerberos5/lib/libhdb/Makefile
==============================================================================
--- head/kerberos5/lib/libhdb/Makefile Wed May 20 18:41:54 2015 (r283159)
+++ head/kerberos5/lib/libhdb/Makefile Wed May 20 18:56:29 2015 (r283160)
@@ -3,7 +3,7 @@
LIB= hdb
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map
-LIBADD= asn1 com_err krb5 roken heimsqlite
+LIBADD= asn1 com_err krb5 roken sqlite3
DPADD= ${LDAPDPADD}
MAN= HDB.3 hdb_entry_ex.3
@@ -56,7 +56,7 @@ SRCS= common.c \
${GEN:S/.x$/.c/:S/.hx$/.h/}
CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \
+ -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \
-I${KRB5DIR}/lib/krb5 \
-I. ${LDAPCFLAGS}
CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
More information about the svn-src-all
mailing list