29 lines
861 B
Plaintext
29 lines
861 B
Plaintext
$NetBSD: patch-mn,v 1.3 2015/05/05 21:42:19 ryoon Exp $
|
|
|
|
Make sure we link correctly with sqlite3 from pkgsrc.
|
|
|
|
--- nss/lib/softoken/config.mk.orig 2015-04-30 20:00:23.000000000 +0000
|
|
+++ nss/lib/softoken/config.mk
|
|
@@ -22,8 +22,8 @@ RESNAME = $(LIBRARY_NAME).rc
|
|
|
|
ifdef NS_USE_GCC
|
|
EXTRA_SHARED_LIBS += \
|
|
- -L$(SQLITE_LIB_DIR) \
|
|
- -l$(SQLITE_LIB_NAME) \
|
|
+ `pkg-config --libs-only-L sqlite3` \
|
|
+ `pkg-config --libs-only-l sqlite3` \
|
|
-L$(NSSUTIL_LIB_DIR) \
|
|
-lnssutil3 \
|
|
-L$(NSPR_LIB_DIR) \
|
|
@@ -47,8 +47,8 @@ else
|
|
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
|
|
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
|
|
EXTRA_SHARED_LIBS += \
|
|
- -L$(SQLITE_LIB_DIR) \
|
|
- -l$(SQLITE_LIB_NAME) \
|
|
+ `pkg-config --libs-only-L sqlite3` \
|
|
+ `pkg-config --libs-only-l sqlite3` \
|
|
-L$(NSSUTIL_LIB_DIR) \
|
|
-lnssutil3 \
|
|
-L$(NSPR_LIB_DIR) \
|