summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libidn
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-05-17 14:38:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:13 +0100
commit504623d1e6a26181564989c7d0f547ed95c2535f (patch)
tree7e57b97916804257c38b1908f27ae78d335d461c /meta/recipes-extended/libidn
parentaaa0808e0e7603a9d3b0a2db050fd5d83e87354b (diff)
downloadpoky-504623d1e6a26181564989c7d0f547ed95c2535f.tar.gz
libidn: upgrade 1.34 -> 1.35
Add autoconf-archive dependency to expand AC_JAVA_OPTIONS and other java-related macros. (From OE-Core rev: 52ba8d490733eb5e830717f414531270d88b3df6) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libidn')
-rw-r--r--meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch8
-rw-r--r--meta/recipes-extended/libidn/libidn_1.35.bb (renamed from meta/recipes-extended/libidn/libidn_1.34.bb)6
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
index 5d03810d00..3c0559e34f 100644
--- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
+++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
@@ -1,4 +1,4 @@
1From c34c7aba769bff3e483f89145055b9b8733435f3 Mon Sep 17 00:00:00 2001 1From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com> 2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Wed, 2 May 2012 18:05:19 -0700 3Date: Wed, 2 May 2012 18:05:19 -0700
4Subject: [PATCH] libtasn1: fix build with automake 1.12 4Subject: [PATCH] libtasn1: fix build with automake 1.12
@@ -19,11 +19,11 @@ Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
19 1 file changed, 4 insertions(+) 19 1 file changed, 4 insertions(+)
20 20
21diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
22index f8049a4..261dad2 100644 22index 8297649..7b9626e 100644
23--- a/configure.ac 23--- a/configure.ac
24+++ b/configure.ac 24+++ b/configure.ac
25@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17) 25@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18)
26 AC_SUBST(LT_REVISION, 18) 26 AC_SUBST(LT_REVISION, 0)
27 AC_SUBST(LT_AGE, 6) 27 AC_SUBST(LT_AGE, 6)
28 28
29+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it 29+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
diff --git a/meta/recipes-extended/libidn/libidn_1.34.bb b/meta/recipes-extended/libidn/libidn_1.35.bb
index 424c6c9f98..d5ce5b46bd 100644
--- a/meta/recipes-extended/libidn/libidn_1.34.bb
+++ b/meta/recipes-extended/libidn/libidn_1.35.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \
10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ 11 file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \
12 file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" 12 file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e"
13DEPENDS = "virtual/libiconv" 13DEPENDS = "virtual/libiconv autoconf-archive"
14 14
15inherit pkgconfig autotools gettext texinfo gtk-doc 15inherit pkgconfig autotools gettext texinfo gtk-doc
16 16
@@ -21,8 +21,8 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
21 file://0001-idn-format-security-warnings.patch \ 21 file://0001-idn-format-security-warnings.patch \
22 " 22 "
23 23
24SRC_URI[md5sum] = "a829db6cd0b85733017c20a50bf10798" 24SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead"
25SRC_URI[sha256sum] = "3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c" 25SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e"
26 26
27# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 27# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
28# so package command into a separate package 28# so package command into a separate package