CVS commit: pkgsrc/devel/nss

["Yuji Yamano" <yyamano%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   yyamano
Date:           Thu Feb  2 07:25:44 UTC 2017

Modified Files:
        pkgsrc/devel/nss: distinfo
Added Files:
        pkgsrc/devel/nss/patches: patch-nss_coreconf_Darwin.mk

Log Message:
Always use the sqlite3 library in NSS to avoid installation error on Mac OS X,
just like other platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.65 pkgsrc/devel/nss/distinfo:1.66
--- pkgsrc/devel/nss/distinfo:1.65      Fri Jan 20 15:01:23 2017
+++ pkgsrc/devel/nss/distinfo   Thu Feb  2 07:25:44 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2017/01/20 15:01:23 ryoon Exp $
+$NetBSD: distinfo,v 1.66 2017/02/02 07:25:44 yyamano Exp $
 
 SHA1 (nss-3.28.1.tar.gz) = 75f220c1c20d8346cde43fb96726d3447c11cf22
 RMD160 (nss-3.28.1.tar.gz) = 816595c4005f2d2ad456946d8cb2000eca06361c
@@ -14,6 +14,7 @@ SHA1 (patch-mh) = a46d3098a85c3a4a57895a
 SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
 SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 7dadcb72acf15714c61ae74b21c5baf45bc51d4c
+SHA1 (patch-nss_coreconf_Darwin.mk) = 4fb0d118f271d1761c22478dab5b487b0e94b645
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = fccc17845c28f5b1268c96eb4e952e32dd530d1d
 SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078
 SHA1 (patch-nss_lib_freebl_config.mk) = 1c198177da8ba7928cbfbd23e385503be99ebe27

Added files:

Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk:1.1
--- /dev/null   Thu Feb  2 07:25:44 2017
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_Darwin.mk       Thu Feb  2 07:25:44 2017
@@ -0,0 +1,37 @@
+$NetBSD: patch-nss_coreconf_Darwin.mk,v 1.1 2017/02/02 07:25:44 yyamano Exp $
+
+Always use the sqlite3 library in NSS to avoid installation error on Mac OS X.
+
+--- nss/coreconf/Darwin.mk.orig        2017-01-04 14:24:24.000000000 +0000
++++ nss/coreconf/Darwin.mk
+@@ -134,17 +134,19 @@ ZLIB_LIBS        = -lz
+ # the NSS libsqlite3.dylib is used instead of the system one. So just use the
+ # system sqlite library on Mac, if it's sufficiently new.
+ 
+-SYS_SQLITE3_VERSION_FULL := $(shell /usr/bin/sqlite3 -version | awk '{print $$1}')
+-SYS_SQLITE3_VERSION_MAJOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$1 }')
+-SYS_SQLITE3_VERSION_MINOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$2 }')
+-
+-ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR))
+-    ifeq (,$(filter-out 0 1 2 3 4,$(SYS_SQLITE3_VERSION_MINOR)))
+-        # sqlite <= 3.4.x is too old, it doesn't provide sqlite3_file_control
+-    else
+-        NSS_USE_SYSTEM_SQLITE = 1
+-    endif
+-endif
++# Always use the library in NSS, just like other platforms.
++#
++#SYS_SQLITE3_VERSION_FULL := $(shell /usr/bin/sqlite3 -version | awk '{print $$1}')
++#SYS_SQLITE3_VERSION_MAJOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$1 }')
++#SYS_SQLITE3_VERSION_MINOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$2 }')
++#
++#ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR))
++#    ifeq (,$(filter-out 0 1 2 3 4,$(SYS_SQLITE3_VERSION_MINOR)))
++#        # sqlite <= 3.4.x is too old, it doesn't provide sqlite3_file_control
++#    else
++#        NSS_USE_SYSTEM_SQLITE = 1
++#    endif
++#endif
+ 
+ include $(CORE_DEPTH)/coreconf/sanitizers.mk
+ DARWIN_SDK_SHLIBFLAGS += $(SANITIZER_LDFLAGS)