diff options
| author | yyamano <yyamano@pkgsrc.org> | 2017-02-02 07:25:44 +0000 |
|---|---|---|
| committer | yyamano <yyamano@pkgsrc.org> | 2017-02-02 07:25:44 +0000 |
| commit | e117ed3369df27b9c2411485386ed80444c7a898 (patch) | |
| tree | ba58ac630172a891a657811f3598b428144a6aba /devel/nss | |
| parent | 7d056d4bc1d41fb5d94f42989c6f993d5544754c (diff) | |
| download | pkgsrc-e117ed3369df27b9c2411485386ed80444c7a898.tar.gz | |
Always use the sqlite3 library in NSS to avoid installation error on Mac OS X,
just like other platforms.
Diffstat (limited to 'devel/nss')
| -rw-r--r-- | devel/nss/distinfo | 3 | ||||
| -rw-r--r-- | devel/nss/patches/patch-nss_coreconf_Darwin.mk | 37 |
2 files changed, 39 insertions, 1 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo index 34209c76737..4cce13e5d77 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -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) = a46d3098a85c3a4a57895a9845bc1741fc5e9561 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 diff --git a/devel/nss/patches/patch-nss_coreconf_Darwin.mk b/devel/nss/patches/patch-nss_coreconf_Darwin.mk new file mode 100644 index 00000000000..0953fe9dd34 --- /dev/null +++ b/devel/nss/patches/patch-nss_coreconf_Darwin.mk @@ -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) |