aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2021-05-09 15:53:24 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2021-05-09 15:55:39 +0000
commit9799d6cea80c198145a8ae41a6308eefb73cce02 (patch)
tree3277cd626e7074d7cbe07ff9e3f67c8f98827ba6
parent0d203bc2abe1b4001bbca78452cec2533701c29c (diff)
downloadaports-9799d6cea80c198145a8ae41a6308eefb73cce02.tar.gz
aports-9799d6cea80c198145a8ae41a6308eefb73cce02.tar.bz2
aports-9799d6cea80c198145a8ae41a6308eefb73cce02.tar.xz
main/ruby: work around bug with autoconf-2.71
-rw-r--r--main/ruby/APKBUILD8
-rw-r--r--main/ruby/remove-broken-autoconf-section.patch30
2 files changed, 36 insertions, 2 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 815e3e328c..2db95899a0 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -75,6 +75,7 @@ source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-$pkgver.tar.gz
rubygems-avoid-platform-specific-gems.patch
test_insns-lower-recursion-depth.patch
fix-get_main_stack.patch
+ remove-broken-autoconf-section.patch
"
replaces="ruby-gems"
@@ -343,7 +344,10 @@ _mvgem() {
}
-sha512sums="1d036d08016351e8f9e7506a6abaf490fe226cf2ff9c2f9df582b57bff22a960dbaf271a8a167ac09f864613b9b8b14191bb79f8a6900ad5ca24131ecf571d54 ruby-2.7.3.tar.gz
+sha512sums="
+1d036d08016351e8f9e7506a6abaf490fe226cf2ff9c2f9df582b57bff22a960dbaf271a8a167ac09f864613b9b8b14191bb79f8a6900ad5ca24131ecf571d54 ruby-2.7.3.tar.gz
a142199140fa711a64717429e9069fd2082319abaf4b129f561db374b3bc16e2a90cc4c849b5d28334505d1c71fed242aef3c44d983da3513d239dcb778673a5 rubygems-avoid-platform-specific-gems.patch
43c1fc80f0dcb4f24d891478889808583da90dc9e0df74c3b1cf41253c13a0d416d2b7ae17e7d53ac1238340a845b088f0fe20324a79905cc6b950b3dcfa4ac6 test_insns-lower-recursion-depth.patch
-3ffc034c01110ee5531265333ca5ee8d61d08131843fe3004c5b34c88c9c1b32cb4ed89574f393177c8bd526e9c15da61ab344f93adf07b9148c561ee19e2eb5 fix-get_main_stack.patch"
+3ffc034c01110ee5531265333ca5ee8d61d08131843fe3004c5b34c88c9c1b32cb4ed89574f393177c8bd526e9c15da61ab344f93adf07b9148c561ee19e2eb5 fix-get_main_stack.patch
+89d4b012ccb46805bf104e44360749a1a745572068778a383491acddd172213fae8239109f95e458c67a16f22f6dcee2ed4cc626cb07a2dc8d36b514912f5bc3 remove-broken-autoconf-section.patch
+"
diff --git a/main/ruby/remove-broken-autoconf-section.patch b/main/ruby/remove-broken-autoconf-section.patch
new file mode 100644
index 0000000000..595a04dd2e
--- /dev/null
+++ b/main/ruby/remove-broken-autoconf-section.patch
@@ -0,0 +1,30 @@
+Description: with autoconf-2.71, this section results a broken configure script.
+
+diff --git a/configure.ac b/configure.ac
+index af170ef..86e26ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,23 +170,6 @@ dnl orig_cxxflags="$cxxflags"
+ dnl cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
+ dnl ])
+
+-AS_CASE(["$host_os:$build_os"],
+-[darwin*:darwin*], [
+- AC_CHECK_TOOLS(CC, [clang gcc cc])
+- # Following Apple deployed clang are broken
+- # 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])
+- ])],
+-[openbsd*:openbsd*], [
+- AC_CHECK_TOOLS(CC, [cc])
+-])
+ AS_IF([test x"${build}" != x"${host}"], [
+ AC_CHECK_TOOL(CC, gcc)
+ ])