From dba27e245e37eb1ffb0c086a0d709deda29eee12 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 24 Jul 2017 17:51:09 +0800 Subject: diffutils: upgrade to 3.6 diffutils-3.5-gcc7.patch is removed as it's merged in this version. do_configure_prepend is removed to solve the following configure error. error: possibly undefined macro: gl_TYPE_WINT_T_PREREQ A workaround patch is made to fix the following compilation error for glibc. error: dereferencing pointer to incomplete type 'const struct rpl_option' (From OE-Core rev: 0c09f9f5700696670b2a9d0466124309100eb296) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- ...need_charset_alias-when-building-for-musl.patch | 33 ++++++++++++++++++++++ .../0001-explicitly-disable-replacing-getopt.patch | 30 ++++++++++++++++++++ .../diffutils/diffutils-3.6/run-ptest | 3 ++ 3 files changed, 66 insertions(+) create mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch create mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch create mode 100644 meta/recipes-extended/diffutils/diffutils-3.6/run-ptest (limited to 'meta/recipes-extended/diffutils/diffutils-3.6') diff --git a/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..ba1a4bab4c --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.6/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 +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 +--- + 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-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch new file mode 100644 index 0000000000..351f87cab5 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch @@ -0,0 +1,30 @@ +Subject: explicitly disable replacing getopt + +Explicitly disable replacing getopt to avoid compilation error like below. + + xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option' + +Upstream-Status: Inappropriate [workaround] +Signed-off-by: Chen Qi +--- + m4/getopt.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/getopt.m4 b/m4/getopt.m4 +index 3ebc7b7..8934426 100644 +--- a/m4/getopt.m4 ++++ b/m4/getopt.m4 +@@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], + fi + ]) + if test $REPLACE_GETOPT = 1; then +- dnl Arrange for getopt.h to be created. +- gl_GETOPT_SUBSTITUTE_HEADER ++ dnl Explicitly disable replacing getopt ++ : + fi + ]) + +-- +2.11.0 + diff --git a/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest b/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest new file mode 100644 index 0000000000..695c5e8a7b --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -C tests check-TESTS -- cgit v1.2.3-54-g00ecf