diff options
Diffstat (limited to 'libs/nss/patches/001-nss_standalone.patch')
| -rw-r--r-- | libs/nss/patches/001-nss_standalone.patch | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/libs/nss/patches/001-nss_standalone.patch b/libs/nss/patches/001-nss_standalone.patch index f24272bc0..8a2c9d6f4 100644 --- a/libs/nss/patches/001-nss_standalone.patch +++ b/libs/nss/patches/001-nss_standalone.patch @@ -10,9 +10,8 @@ Description: Adds auto-generated nss.pc and nss-config script, and For 3.48, Requires: updated to nspr >= 4.24. For 3.51.1, Requires: updated to nspr >= 4.25. -diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile ---- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600 -+++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600 +--- a/nss/Makefile ++++ b/nss/Makefile @@ -48,7 +48,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### @@ -21,9 +20,8 @@ diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile $(MAKE) all $(MAKE) latest -diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile ---- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600 +--- /dev/null ++++ b/nss/config/Makefile @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -65,9 +63,8 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile + +dummy: all export libs + -diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in ---- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600 +--- /dev/null ++++ b/nss/config/nss-config.in @@ -0,0 +1,153 @@ +#!/bin/sh + @@ -222,9 +219,8 @@ diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-confi + echo $libdirs +fi + -diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in ---- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600 +--- /dev/null ++++ b/nss/config/nss.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -238,9 +234,8 @@ diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in +Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ +Cflags: -I${includedir} + -diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn ---- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600 -+++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600 +--- a/nss/manifest.mn ++++ b/nss/manifest.mn @@ -10,7 +10,7 @@ IMPORTS = nspr20/v4.8 \ RELEASE = nss @@ -248,6 +243,5 @@ diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn -DIRS = coreconf lib cmd cpputil gtests +DIRS = coreconf lib cmd cpputil config - lib: coreconf - cmd: lib + HAVE_ALL_TARGET := 1 |