diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-29 16:01:40 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-29 16:01:40 +0000 |
| commit | c60fb8a774181ae8e6269c781408f3becb480bf7 (patch) | |
| tree | a3048ecf3ce7753bffa04513c136c99cfaf684c7 /main/ruby | |
| parent | c63cde4dec703b4314807379a8fadf8eaa45c35c (diff) | |
| download | aports-c60fb8a774181ae8e6269c781408f3becb480bf7.tar.bz2 aports-c60fb8a774181ae8e6269c781408f3becb480bf7.tar.xz | |
main/ruby: fix musl build
patch from sabotage
Diffstat (limited to 'main/ruby')
| -rw-r--r-- | main/ruby/APKBUILD | 22 | ||||
| -rw-r--r-- | main/ruby/ruby-io.patch | 21 |
2 files changed, 33 insertions, 10 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index 0a1867d107..519146d10a 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -21,6 +21,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-irb " 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 $patches" @@ -34,11 +35,9 @@ replaces="ruby-gems" _builddir="$srcdir/$pkgname-${_pkgver}" _gemdir="/usr/lib/ruby/gems/$_abi" _rubydir="/usr/lib/ruby/$_abi" -[ "$ALPINE_LIBC" != "eglibc" ] && _libc="-uclibc" - _arch=$CARCH case $CARCH in - x86) _arch=i386;; +x86) _arch=i386;; esac prepare() { @@ -67,7 +66,7 @@ build() { export INSTALL=install case "$CLIBC" in - uclibc) + uclibc | musl) # the configure script does not detect isnan/isinf as macros export ac_cv_func_isnan=yes export ac_cv_func_isinf=yes @@ -121,7 +120,7 @@ _mvgem() { cd "$pkgdir" for i in ./$_rubydir/${1}.rb \ ./$_rubydir/${1} \ - ./$_rubydir/$_arch-linux${_libc}/${1} \ + ./$_rubydir/$_arch-linux-${CLIBC}/${1} \ ./$_gemdir/gems/${1}-* \ ./$_gemdir/specifications/default/${1}-* ; do [ -e "$pkgdir"/$i ] || continue @@ -133,7 +132,7 @@ _rmgem() { cd "$pkgdir" for i in ./$_rubydir/${1}.rb \ ./$_rubydir/${1} \ - ./$_rubydir/$_arch-linux${_libc}/${1} \ + ./$_rubydir/$_arch-linux-${CLIBC}/${1} \ ./$_gemdir/gems/${1}-* \ ./$_gemdir/specifications/default/${1}-* ; do [ -e "$pkgdir"/$i ] && rm -r "$pkgdir/$i" @@ -180,7 +179,7 @@ io_console() { depends="ruby" _mvgem io-console _mv $_rubydir/io \ - $_rubydir/$_arch-linux${_libc}/io/console.so + $_rubydir/$_arch-linux-${CLIBC}/io/console.so } minitest() { @@ -198,8 +197,11 @@ libs() { } md5sums="60913f3eec0c4071f44df42600be2604 ruby-2.0.0-p247.tar.bz2 -8395693c99415532780605af203a102b ruby-1.9.3-always-use-i386.patch" +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" +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" +1531a8d056cca385401bdf56523127d3ce405cc2703c24069a5fb3d803dee35122e9274022a2891a32fdb229280bf50918d91b67e9a5f2ad951fe11e49bd3c1c ruby-1.9.3-always-use-i386.patch +af001e5540e65e3a042d193a56cb46c3983de1c77ca89869406816561021480741b856996d252a97913fb882cb739949f6dbb6754790e54258b58a9d861be1ba ruby-io.patch" diff --git a/main/ruby/ruby-io.patch b/main/ruby/ruby-io.patch new file mode 100644 index 0000000000..7d89b3a281 --- /dev/null +++ b/main/ruby/ruby-io.patch @@ -0,0 +1,21 @@ +diff -r 717f4d34f468 io.c +--- a/io.c Tue Mar 05 06:12:37 2013 +0000 ++++ b/io.c Tue Mar 05 06:17:04 2013 +0000 +@@ -8020,7 +8020,7 @@ + + #define DEFULT_IOCTL_NARG_LEN (256) + +-#ifdef __linux__ ++#if defined(__GLIBC__) && defined(__linux__) + static long + linux_iocparm_len(ioctl_req_t cmd) + { +@@ -8053,7 +8053,7 @@ + #endif + #ifdef IOCPARM_LEN + len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */ +-#elif defined(__linux__) ++#elif defined(__GLIBC__) && defined(__linux__) + len = linux_iocparm_len(cmd); + #else + /* otherwise guess at what's safe */ |