diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-lang/ruby/files/2.6 | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'dev-lang/ruby/files/2.6')
-rw-r--r-- | dev-lang/ruby/files/2.6/002-autoconf-2.70.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch new file mode 100644 index 000000000000..576ed6c759bd --- /dev/null +++ b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch @@ -0,0 +1,65 @@ +From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Mon, 16 Nov 2020 08:42:15 +0000 +Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70 + +The failure initially noticed on `autoconf-2.69d` (soon to become 2.70): + +``` +$ ./configure +./configure: line 8720: syntax error near unexpected token `fi' +./configure: line 8720: `fi' +``` + +Before the change generated `./configure ` snippet looked like: + +``` + if ! $CC -E -xc - <<SRC >/dev/null +then : + + #if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 + #error premature clang + #endif +SRC + as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5 +fi +``` + +Note the newline that breaks here-document syntax. + +After the change the snippet does not use here-document. + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + configure.ac | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a5e3dc76f6..4e4a52f066 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"], + # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported) + # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn) + # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn) +- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [ +- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 +- @%:@error premature clang +- @%:@endif +-SRC +- AC_MSG_ERROR([clang version 3.0 or later is required]) +- ]) ++ AC_PREPROC_IFELSE( ++ [AC_LANG_PROGRAM([ ++ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 ++ @%:@error premature clang ++ @%:@endif ++ ])], ++ [], ++ [AC_MSG_ERROR([clang version 3.0 or later is required])]) + ]) + + AS_CASE(["$target_os"], +-- +2.29.2 + |