Date: Tuesday, January 2, 2018 @ 08:47:21 Author: heftig Revision: 277673
3.88-1 Modified: rubinius/trunk/PKGBUILD rubinius/trunk/dirs.patch ------------+ PKGBUILD | 61 ++++++++++++++++++++++++----------------------------------- dirs.patch | 6 ++--- 2 files changed, 28 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-02 08:25:39 UTC (rev 277672) +++ PKGBUILD 2018-01-02 08:47:21 UTC (rev 277673) @@ -3,68 +3,56 @@ pkgbase=rubinius pkgname=(rubinius rubinius-ruby) -pkgver=3.86 +pkgver=3.88 pkgrel=1 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(x86_64) -url="http://rubinius.com"; -license=(custom) +url="https://rubinius.com"; +license=(custom:BSD MPL2) depends=(libffi openssl-1.0 libyaml) makedepends=(llvm ruby clang valgrind) options=(!emptydirs) source=(http://releases.rubinius.com/${pkgbase}-${pkgver}.tar.bz2 gemrc dirs.patch) -sha256sums=('cfb0650b937d109cf52c982f185ef247cc7a184dbb5f16c625d4827cef11f6fb' +sha256sums=('e1c11578256b072870cfe929edfcb5965f076ef7543a92c7d0e6cf4c22787fae' '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' - '1bfb4d590d35f01b3ee344cec8f961558f08847b3db54e5f56a4a20a22a898ec') + '01eaefc509d3192ade1115282b42e06a72b0ab9353b61d1779db296bb832e2f2') -_common() { - export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig - export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" TMPDIR="$srcdir" +prepare() { cd $pkgbase-$pkgver -} - -prepare() { - _common - patch -Np1 -i ../dirs.patch - - mkdir -p "$GEM_HOME" - gem install --no-user-install -N vendor/cache/bundler-*.gem - - "$GEM_HOME/bin/bundle" install --local } build() { - _common - ./configure --prefix=/usr \ + export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig + + cd $pkgbase-$pkgver + ./configure \ + --prefix=/usr \ --mandir=/usr/share/man \ --includedir=/usr/include/rubinius \ --appdir=/usr/lib/rubinius \ --gemsdir=/usr/lib/rubinius/gems \ + --bin-link bundle \ + --bin-link bundler \ --preserve-prefix \ --without-rpath \ - --bin-link bundle --bin-link bundler - "$GEM_HOME/bin/bundle" exec rake build + --release-build + rake build } check() { - _common - rake vm:test || : + cd $pkgbase-$pkgver + rake vm:test } package_rubinius() { - optdepends=('ruby-docs: Ruby documentation') + export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig - _common + cd $pkgbase-$pkgver + DESTDIR="$pkgdir" rake install:files + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE BSD_LICENSE - DESTDIR="$pkgdir" "$GEM_HOME/bin/bundle" exec rake install - - mkdir -p "$pkgdir/usr/share/ri" - ln -s 2.4.0 "$pkgdir/usr/share/ri/2.3" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/rubinius/LICENSE" - ### Split rubinius-ruby mkdir -p "$srcdir/ruby/usr/bin" for _f in "$pkgdir"/usr/bin/*; do @@ -81,7 +69,8 @@ backup=(etc/gemrc) mv ruby/* "$pkgdir" - install -Dm644 gemrc "$pkgdir/etc/gemrc" - install -d "$pkgdir/usr/share/licenses/rubinius-ruby" - ln -s ../rubinius/LICENSE "$pkgdir/usr/share/licenses/rubinius-ruby/LICENSE" + install -Dt "$pkgdir/etc" -m644 gemrc + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s rubinius "$pkgdir/usr/share/licenses/$pkgname" } Modified: dirs.patch =================================================================== --- dirs.patch 2018-01-02 08:25:39 UTC (rev 277672) +++ dirs.patch 2018-01-02 08:47:21 UTC (rev 277673) @@ -1,13 +1,13 @@ diff --git i/core/rbconfig.rb w/core/rbconfig.rb -index 8d23097..acd6ed8 100644 +index c6c03f0bec61b5b4..f393497c26ff3c64 100644 --- i/core/rbconfig.rb +++ w/core/rbconfig.rb -@@ -14,12 +14,12 @@ module RbConfig +@@ -15,12 +15,12 @@ module RbConfig CONFIG["exec_prefix"] = "$(prefix)" CONFIG["bindir"] = Rubinius::BIN_PATH.dup CONFIG["sbindir"] = "$(exec_prefix)/sbin" - CONFIG["libexecdir"] = "$(exec_prefix)/libexec" -+ CONFIG["libexecdir"] = "/usr/lib/rubinius" ++ CONFIG["libexecdir"] = "$(exec_prefix)/lib" CONFIG["datarootdir"] = "$(prefix)/share" CONFIG["datadir"] = "$(datarootdir)" - CONFIG["sysconfdir"] = "$(prefix)/etc"
