summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch7
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch7
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb (renamed from meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb)2
3 files changed, 7 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
index f107f42dab..697a8ee355 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
@@ -1,4 +1,4 @@
1From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 1From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 4 Feb 2020 23:39:49 -0800 3Date: Tue, 4 Feb 2020 23:39:49 -0800
4Subject: [PATCH] nss/nspr: fix for multilib 4Subject: [PATCH] nss/nspr: fix for multilib
@@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9
10--- 9---
11 configure.ac | 16 ++++++++-------- 10 configure.ac | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-) 11 1 file changed, 8 insertions(+), 8 deletions(-)
13 12
14diff --git a/configure.ac b/configure.ac 13diff --git a/configure.ac b/configure.ac
15index 51621d6..3d23683 100644 14index 7f137c0..e15f5bc 100644
16--- a/configure.ac 15--- a/configure.ac
17+++ b/configure.ac 16+++ b/configure.ac
18@@ -960,24 +960,24 @@ fi 17@@ -958,24 +958,24 @@ fi
19 dnl Priority 1: User specifies the path to installation 18 dnl Priority 1: User specifies the path to installation
20 if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then 19 if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
21 AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) 20 AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
index 3a1531deb1..61c56ffc8b 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
@@ -1,4 +1,4 @@
1From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 1From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001
2From: Yulong Pei <Yulong.pei@windriver.com> 2From: Yulong Pei <Yulong.pei@windriver.com>
3Date: Wed, 21 Jul 2010 22:33:43 +0800 3Date: Wed, 21 Jul 2010 22:33:43 +0800
4Subject: [PATCH] change finding path of nss and nspr 4Subject: [PATCH] change finding path of nss and nspr
@@ -8,16 +8,15 @@ Upstream-Status: Pending
8Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> 8Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
9Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> 9Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
10Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 10Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11
12--- 11---
13 configure.ac | 2 +- 12 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
17index ce8a278..51621d6 100644 16index 8add879..7f137c0 100644
18--- a/configure.ac 17--- a/configure.ac
19+++ b/configure.ac 18+++ b/configure.ac
20@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss 19@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss
21 NSPR_INCLUDE_MARKER="nspr/nspr.h" 20 NSPR_INCLUDE_MARKER="nspr/nspr.h"
22 NSPR_LIB_MARKER="libnspr4$shrext" 21 NSPR_LIB_MARKER="libnspr4$shrext"
23 NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" 22 NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
index 7639209e19..994adef3af 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
22 file://ensure-search-path-non-host.patch \ 22 file://ensure-search-path-non-host.patch \
23 " 23 "
24 24
25SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" 25SRC_URI[sha256sum] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"
26 26
27inherit autotools-brokensep ptest pkgconfig 27inherit autotools-brokensep ptest pkgconfig
28 28