aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/ruby/APKBUILD6
-rw-r--r--main/ruby/ruby-1.9.3-always-use-i386.patch11
2 files changed, 1 insertions, 16 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 55fae4fa24..53c248f1db 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby
pkgver=2.0.0_p247
_pkgver=${pkgver/_/-}
-pkgrel=2
+pkgrel=3
_abi=2.0.0
@@ -20,7 +20,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-irb
$pkgname-libs
"
patches="
- ruby-1.9.3-always-use-i386.patch
ruby-io.patch
"
source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/${pkgname}-${_pkgver}.tar.bz2
@@ -197,11 +196,8 @@ libs() {
}
md5sums="60913f3eec0c4071f44df42600be2604 ruby-2.0.0-p247.tar.bz2
-8395693c99415532780605af203a102b ruby-1.9.3-always-use-i386.patch
7a4d86c7bf1ddad97f1cde52d849202f ruby-io.patch"
sha256sums="08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a ruby-2.0.0-p247.tar.bz2
-bce3b741537f7b86e4578c5420a1a8bea87e7c8b94fc3c42cd34eecf8503eb92 ruby-1.9.3-always-use-i386.patch
f8822c378f94ecce7214c370703db74723e2b3ce9efa956840036b1ffd8f32e1 ruby-io.patch"
sha512sums="9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f ruby-2.0.0-p247.tar.bz2
-1531a8d056cca385401bdf56523127d3ce405cc2703c24069a5fb3d803dee35122e9274022a2891a32fdb229280bf50918d91b67e9a5f2ad951fe11e49bd3c1c ruby-1.9.3-always-use-i386.patch
af001e5540e65e3a042d193a56cb46c3983de1c77ca89869406816561021480741b856996d252a97913fb882cb739949f6dbb6754790e54258b58a9d861be1ba ruby-io.patch"
diff --git a/main/ruby/ruby-1.9.3-always-use-i386.patch b/main/ruby/ruby-1.9.3-always-use-i386.patch
deleted file mode 100644
index f5a8c3de38..0000000000
--- a/main/ruby/ruby-1.9.3-always-use-i386.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in.orig 2011-10-18 08:56:21.587594685 +0200
-+++ b/configure.in 2011-10-18 08:56:59.751593321 +0200
-@@ -2935,6 +2935,8 @@
- configure_args=$ac_configure_args
- AC_SUBST(configure_args)dnl
-
-+target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-+
- if test "${universal_binary-no}" = yes ; then
- arch="universal-${target_os}"
- AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,