diff options
Diffstat (limited to 'meta/recipes-devtools/patch')
3 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc new file mode 100644 index 0000000000..cbfb8cfcf5 --- /dev/null +++ b/meta/recipes-devtools/patch/patch.inc @@ -0,0 +1,14 @@ +SUMMARY = "Tool for applying a patch file" +DESCRIPTION = "patch takes a patch file containing a difference listing \ +produced by the diff program and applies those differences to one or more \ +original files, producing patched versions." +SECTION = "utils" +HOMEPAGE = "http://savannah.gnu.org/projects/patch/" + +SRC_URI = "${GNU_MIRROR}/patch/patch-${PV}.tar.gz" +S = "${WORKDIR}/patch-${PV}" + +inherit autotools update-alternatives + +ALTERNATIVE_${PN} = "patch" +ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..ba1a4bab4c --- /dev/null +++ b/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,33 @@ +From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Apr 2015 17:02:13 -0700 +Subject: [PATCH] Unset need_charset_alias when building for musl + +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 +which actually shoudl be fixed in gnulib and then all downstream +projects will get it eventually. For now we apply the fix to +coreutils + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gnulib.mk b/lib/gnulib.mk +index e1d74db..c0e92dd 100644 +--- a/lib/gnulib.mk ++++ b/lib/gnulib.mk +@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +-- +2.1.4 + diff --git a/meta/recipes-devtools/patch/patch_2.7.5.bb b/meta/recipes-devtools/patch/patch_2.7.5.bb new file mode 100644 index 0000000000..151f021b2c --- /dev/null +++ b/meta/recipes-devtools/patch/patch_2.7.5.bb @@ -0,0 +1,15 @@ +require patch.inc +LICENSE = "GPLv3" + +SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch" + +SRC_URI[md5sum] = "ed4d5674ef4543b4eb463db168886dc7" +SRC_URI[sha256sum] = "7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +acpaths = "-I ${S}/m4 " + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" +PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," + |