summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.0.5.bb4
2 files changed, 26 insertions, 1 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
new file mode 100644
index 0000000000..ace50bbfde
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch
@@ -0,0 +1,23 @@
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.0.5.bb
index aaf9ecd7e7..0d7bddbc7f 100644
--- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \
9 file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \ 9 file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \
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 \
14 "
13SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36" 15SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
14SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8" 16SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"
15 17