From: Wang Mingyu <[email protected]> Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit baa80b33057efd5077dd438132837b65de1ba40b) Signed-off-by: Ankur Tyagi <[email protected]> --- .../xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch | 7 +++---- .../xmlsec1/xmlsec1/change-finding-path-of-nss.patch | 7 +++---- .../xmlsec1/{xmlsec1_1.3.4.bb => xmlsec1_1.3.5.bb} | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) rename meta-oe/recipes-support/xmlsec1/{xmlsec1_1.3.4.bb => xmlsec1_1.3.5.bb} (96%)
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 @@ -From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 +From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 4 Feb 2020 23:39:49 -0800 Subject: [PATCH] nss/nspr: fix for multilib @@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib Upstream-Status: Pending Signed-off-by: Chen Qi <[email protected]> - --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 51621d6..3d23683 100644 +index 7f137c0..e15f5bc 100644 --- a/configure.ac +++ b/configure.ac -@@ -960,24 +960,24 @@ fi +@@ -958,24 +958,24 @@ fi dnl Priority 1: User specifies the path to installation if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then 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 @@ -From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 +From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001 From: Yulong Pei <[email protected]> Date: Wed, 21 Jul 2010 22:33:43 +0800 Subject: [PATCH] change finding path of nss and nspr @@ -8,16 +8,15 @@ Upstream-Status: Pending Signed-off-by: Yulong Pei <[email protected]> Signed-off-by: Mingli Yu <[email protected]> Signed-off-by: Yi Zhao <[email protected]> - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ce8a278..51621d6 100644 +index 8add879..7f137c0 100644 --- a/configure.ac +++ b/configure.ac -@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss +@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" 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 similarity index 96% rename from meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb rename to meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb index 64912c3b03..50c387d250 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 = "https://github.com/lsh123/xmlsec/releases/download/${PR}/${BP}.tar.gz file://ensure-search-path-non-host.patch \ " -SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" +SRC_URI[sha256sum] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917" inherit autotools-brokensep ptest pkgconfig
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121601): https://lists.openembedded.org/g/openembedded-devel/message/121601 Mute This Topic: https://lists.openembedded.org/mt/116270424/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
