Page MenuHomeFreeBSD
Files F157492768

D2443.id5189.diff
No OneTemporary
Actions

D2443.id5189.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1682,7 +1682,7 @@
${_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} \
@@ -1789,7 +1789,7 @@
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 \
@@ -1802,7 +1802,7 @@
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"
@@ -1818,7 +1818,7 @@
_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
Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -38,6 +38,15 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150505
+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
# 20150504
OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
Index: kerberos5/lib/Makefile
===================================================================
--- kerberos5/lib/Makefile
+++ kerberos5/lib/Makefile
@@ -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
Index: kerberos5/lib/libhdb/Makefile
===================================================================
--- kerberos5/lib/libhdb/Makefile
+++ kerberos5/lib/libhdb/Makefile
@@ -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 @@
${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\""
Index: kerberos5/lib/libheimsqlite/Makefile
===================================================================
--- kerberos5/lib/libheimsqlite/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-LIB= heimsqlite
-SRCS= sqlite3.c
-LIBADD= pthread
-CFLAGS+=-I${KRB5DIR}/lib/sqlite
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/sqlite

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 1:02 AM (3 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33426344
Default Alt Text
D2443.id5189.diff (3 KB)

Event Timeline