From 09bb3ef33a4eea4ed140b39103179372b9d9a07a Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Fri, 8 Apr 2016 15:41:44 +0200 Subject: testing/jruby: remove post-install workaround for crypt.so --- testing/jruby/APKBUILD | 5 ++--- testing/jruby/jruby.post-install | 13 ------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 testing/jruby/jruby.post-install diff --git a/testing/jruby/APKBUILD b/testing/jruby/APKBUILD index 0156653bac..010355e16d 100644 --- a/testing/jruby/APKBUILD +++ b/testing/jruby/APKBUILD @@ -4,15 +4,14 @@ # so it's probably not much usable for regular users. pkgname=jruby pkgver=9.0.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="An implementation of Ruby on the JVM" url="http://jruby.org" arch="noarch" license="EPL GPL-2 LGPL-2.1 custom" # libc6-compat: https://github.com/jnr/jnr-posix/issues/73 -depends="java-jffi-native>=1.2 libc6-compat openjdk8-jre" +depends="java-jffi-native>=1.2 libc6-compat>=1.1.12-r5 openjdk8-jre" makedepends="openjdk8 zip" -install="$pkgname.post-install" subpackages="$pkgname-irb $pkgname-maven $pkgname-minitest $pkgname-rake $pkgname-rdoc $pkgname-readline $pkgname-testunit $pkgname-libs " diff --git a/testing/jruby/jruby.post-install b/testing/jruby/jruby.post-install deleted file mode 100644 index 8b2e94b06f..0000000000 --- a/testing/jruby/jruby.post-install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# TODO: Remove after merging musl-1.1.14-r8 into stable branch. - -if [ ! -e /usr/lib/libcrypt.so* ]; then - cat <<-EOF 1>&2 - * Symlink /usr/lib/libcrypt.so* does not exist, you probably use older - * revision of lib6-compat package. Since it's necessary for JRuby to work - * correctly, it'll be created now. - EOF - - ln -s /usr/lib/libc.so /usr/lib/libcrypt.so.1 -fi -- cgit v1.2.3