mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
xmlsec1: upgrade 1.3.5 -> 1.3.7
0001-nss-nspr-fix-for-multilib.patch makefile-ptest.patch xmlsec1-examples-allow-build-in-separate-dir.patch refreshed for 1.3.7 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
b815bcc234
commit
74c7e41978
|
|
@ -11,10 +11,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7f137c0..e15f5bc 100644
|
||||
index 40e9c0d..8f42d4d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -958,24 +958,24 @@ fi
|
||||
@@ -966,24 +966,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)
|
||||
|
|
@ -27,8 +27,8 @@ index 7f137c0..e15f5bc 100644
|
|||
NSPR_FOUND="yes"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?])
|
||||
+ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?])
|
||||
- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER"])
|
||||
+ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER"])
|
||||
fi
|
||||
fi
|
||||
if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
|
||||
|
|
@ -42,8 +42,11 @@ index 7f137c0..e15f5bc 100644
|
|||
NSS_FOUND="yes"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?])
|
||||
+ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?])
|
||||
- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER"])
|
||||
+ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER"])
|
||||
fi
|
||||
fi
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index 02480c2..cbc2661 100644
|
||||
index 0b352bc..de3c217 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -8,9 +8,17 @@ PROGRAMS = \
|
||||
decrypt1 decrypt2 decrypt3 \
|
||||
@@ -12,9 +12,17 @@ PROGRAMS = \
|
||||
$(PROGRAMS_DEC) \
|
||||
xmldsigverify
|
||||
|
||||
+ifndef CC
|
||||
|
|
@ -38,5 +38,5 @@ index 02480c2..cbc2661 100644
|
|||
all: $(PROGRAMS)
|
||||
|
||||
--
|
||||
2.25.1
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index cbc2661..e882b61 100644
|
||||
index de3c217..2e0ab6e 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -12,8 +12,10 @@ ifndef CC
|
||||
@@ -16,8 +16,10 @@ ifndef CC
|
||||
CC = gcc
|
||||
endif
|
||||
|
||||
|
|
@ -28,5 +28,5 @@ index cbc2661..e882b61 100644
|
|||
DESTDIR = /usr/share/xmlsec1
|
||||
install-ptest:
|
||||
--
|
||||
2.25.1
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
|
|||
|
||||
SECTION = "libs"
|
||||
|
||||
SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PR}/${BP}.tar.gz \
|
||||
SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PV}/${BP}.tar.gz \
|
||||
file://fix-ltmain.sh.patch \
|
||||
file://change-finding-path-of-nss.patch \
|
||||
file://makefile-ptest.patch \
|
||||
|
|
@ -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] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"
|
||||
SRC_URI[sha256sum] = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea"
|
||||
|
||||
inherit autotools-brokensep ptest pkgconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user