summaryrefslogtreecommitdiffstats
path: root/patches/nss-3.47
diff options
context:
space:
mode:
Diffstat (limited to 'patches/nss-3.47')
-rw-r--r--patches/nss-3.47/0001-nss-fix-nsinstall-build.patch43
-rw-r--r--patches/nss-3.47/0002-add-nss.pc.in.patch27
-rw-r--r--patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch21
-rw-r--r--patches/nss-3.47/series6
4 files changed, 97 insertions, 0 deletions
diff --git a/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch
new file mode 100644
index 0000000..ab3f913
--- /dev/null
+++ b/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch
@@ -0,0 +1,43 @@
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Tue, 12 Apr 2016 11:33:52 +0200
+Subject: [PATCH] nss: fix nsinstall build
+
+Fix nss multilib build on openSUSE 11.x 32bit
+
+While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will
+fail with error:
+
+* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled
+
+It caused by the '-m64' option which passed to host gcc.
+
+The nsinstall was built first while nss starting to build, it only runs
+on host to install built files, it doesn't need any cross-compling or
+multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
+error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ nss/coreconf/nsinstall/Makefile | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
+index 1850bcb93cf7..75297de39ce1 100644
+--- a/nss/coreconf/nsinstall/Makefile
++++ b/nss/coreconf/nsinstall/Makefile
+@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1
+
+ include $(DEPTH)/coreconf/config.mk
+
++# nsinstall is unfit for cross-compiling/multilib-build since it was
++# always run on local host to install built files. This change intends
++# to clean the '-m64' from ARCHFLAG and LDFLAGS.
++ARCHFLAG =
++LDFLAGS =
++CFLAGS =
++
+ ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+ PROGRAM =
+ else
diff --git a/patches/nss-3.47/0002-add-nss.pc.in.patch b/patches/nss-3.47/0002-add-nss.pc.in.patch
new file mode 100644
index 0000000..addc805
--- /dev/null
+++ b/patches/nss-3.47/0002-add-nss.pc.in.patch
@@ -0,0 +1,27 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Tue, 12 Apr 2016 11:36:26 +0200
+Subject: [PATCH] add nss.pc.in
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ nss/nss.pc.in | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 nss/nss.pc.in
+
+diff --git a/nss/nss.pc.in b/nss/nss.pc.in
+new file mode 100644
+index 000000000000..b80838f8ca0d
+--- /dev/null
++++ b/nss/nss.pc.in
+@@ -0,0 +1,11 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include/nss
++
++Name: NSS
++Description: Mozilla Network Security Services
++Version: @VERSION@
++Requires: nspr
++Libs: -lnss3 -lnssutil3 -lsmime3 -lssl3
++Cflags: -I${includedir}
diff --git a/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch b/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch
new file mode 100644
index 0000000..568d8f7
--- /dev/null
+++ b/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch
@@ -0,0 +1,21 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 15 Apr 2019 18:11:49 +0200
+Subject: [PATCH] HACK: don't build the commands
+
+They are not needed or installed and have zlib as extra dependency.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ nss/manifest.mn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/manifest.mn b/nss/manifest.mn
+index 500a5ad64b62..03d8e620ea4b 100644
+--- a/nss/manifest.mn
++++ b/nss/manifest.mn
+@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cpputil gtests
diff --git a/patches/nss-3.47/series b/patches/nss-3.47/series
new file mode 100644
index 0000000..f7f38f3
--- /dev/null
+++ b/patches/nss-3.47/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-nss-fix-nsinstall-build.patch
+0002-add-nss.pc.in.patch
+0003-HACK-don-t-build-the-commands.patch
+# 5a106339b1aacb64732e0a72df6e0416 - git-ptx-patches magic