summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-04-15 18:13:41 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-04-15 18:13:55 +0200
commitb7f5726e8cb35f647bc76517fb44938285c33f27 (patch)
tree993231d6a4a02f01d5645ad5f9aad33372e06907 /patches
parent192a0c4c216e45acc6ab8e506e17f66806853a45 (diff)
downloadptxdist-b7f5726e8cb35f647bc76517fb44938285c33f27.tar.gz
ptxdist-b7f5726e8cb35f647bc76517fb44938285c33f27.tar.xz
nss: version bump 3.40 -> 3.43
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/nss-3.43/0001-nss-fix-nsinstall-build.patch (renamed from patches/nss-3.40/0001-nss-fix-nsinstall-build.patch)0
-rw-r--r--patches/nss-3.43/0002-add-nss.pc.in.patch (renamed from patches/nss-3.40/0002-add-nss.pc.in.patch)0
-rw-r--r--patches/nss-3.43/0003-HACK-don-t-build-the-commands.patch21
-rw-r--r--patches/nss-3.43/series (renamed from patches/nss-3.40/series)3
4 files changed, 23 insertions, 1 deletions
diff --git a/patches/nss-3.40/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.43/0001-nss-fix-nsinstall-build.patch
index ab3f9133e..ab3f9133e 100644
--- a/patches/nss-3.40/0001-nss-fix-nsinstall-build.patch
+++ b/patches/nss-3.43/0001-nss-fix-nsinstall-build.patch
diff --git a/patches/nss-3.40/0002-add-nss.pc.in.patch b/patches/nss-3.43/0002-add-nss.pc.in.patch
index addc805b5..addc805b5 100644
--- a/patches/nss-3.40/0002-add-nss.pc.in.patch
+++ b/patches/nss-3.43/0002-add-nss.pc.in.patch
diff --git a/patches/nss-3.43/0003-HACK-don-t-build-the-commands.patch b/patches/nss-3.43/0003-HACK-don-t-build-the-commands.patch
new file mode 100644
index 000000000..568d8f751
--- /dev/null
+++ b/patches/nss-3.43/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.40/series b/patches/nss-3.43/series
index 15cc5cf3f..f7f38f3be 100644
--- a/patches/nss-3.40/series
+++ b/patches/nss-3.43/series
@@ -2,4 +2,5 @@
#tag:base --start-number 1
0001-nss-fix-nsinstall-build.patch
0002-add-nss.pc.in.patch
-# 9b53c047a21dbd46d849e90d773bd0d8 - git-ptx-patches magic
+0003-HACK-don-t-build-the-commands.patch
+# 5a106339b1aacb64732e0a72df6e0416 - git-ptx-patches magic