summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-06-04 17:04:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-04 23:09:25 +0100
commit9d36aaacd47c7c88e31724c6dac3ab86edc47d41 (patch)
tree8bccf8444182594881bef8bb9b3284edd0ecbb6f /meta/recipes-extended
parent6a0d6ca080c62032b081eb9bd299441700bbe237 (diff)
downloadpoky-9d36aaacd47c7c88e31724c6dac3ab86edc47d41.tar.gz
libidn2: upgrade to 2.2.0
The unistring patch isn't needed anymore (the relevant lines are entirely removed). License checksums updated because of a typo fix, and an added author name. (From OE-Core rev: 73fe3f7108e1d194961440f63afa73d5f7a0b983) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch23
-rw-r--r--meta/recipes-extended/libidn/libidn2_2.2.0.bb (renamed from meta/recipes-extended/libidn/libidn2_2.0.5.bb)12
2 files changed, 5 insertions, 30 deletions
diff --git a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ace50bbfde..0000000000
--- a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Unset need_charset_alias when building for musl
2
3localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
4which actually shoudl be fixed in gnulib and then all downstream
5projects will get it eventually. For now we apply the fix to
6coreutils
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Index: libidn2-2.0.5/unistring/Makefile.am
12===================================================================
13--- libidn2-2.0.5.orig/unistring/Makefile.am
14+++ libidn2-2.0.5/unistring/Makefile.am
15@@ -293,7 +293,7 @@ install-exec-localcharset: all-local
16 case '$(host_os)' in \
17 darwin[56]*) \
18 need_charset_alias=true ;; \
19- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
20+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
21 need_charset_alias=false ;; \
22 *) \
23 need_charset_alias=true ;; \
diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb b/meta/recipes-extended/libidn/libidn2_2.2.0.bb
index 0daf7a6877..d7fec89fba 100644
--- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.2.0.bb
@@ -3,17 +3,15 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification
3HOMEPAGE = "http://www.gnu.org/software/libidn/" 3HOMEPAGE = "http://www.gnu.org/software/libidn/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+" 5LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \
7 file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 7 file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \ 9 file://src/idn2.c;endline=16;md5=426b74d6deb620ab6d39c8a6efd4c13a \
10 file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f" 10 file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"
11 11
12SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ 12SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
13 file://Unset-need_charset_alias-when-building-for-musl.patch \ 13SRC_URI[md5sum] = "b846d4d20e22b99d6f7387bb66e00a1f"
14 " 14SRC_URI[sha256sum] = "fc734732b506d878753ec6606982bf7b936e868c25c30ddb0d83f7d7056381fe"
15SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
16SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"
17 15
18DEPENDS = "virtual/libiconv libunistring" 16DEPENDS = "virtual/libiconv libunistring"
19 17