| 1 |
commit: cd210311a796e334ec9d79304f8ae6c17ec11280 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 28 08:45:59 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 28 08:45:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cd210311 |
| 7 |
|
| 8 |
dev-lang/ruby: fix installation on Darwin |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.17 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/ruby/ruby-2.4.6.ebuild | 8 ++++++-- |
| 14 |
dev-lang/ruby/ruby-2.5.5.ebuild | 10 +++++++--- |
| 15 |
dev-lang/ruby/ruby-2.6.3.ebuild | 10 +++++++--- |
| 16 |
3 files changed, 20 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/ruby/ruby-2.4.6.ebuild b/dev-lang/ruby/ruby-2.4.6.ebuild |
| 19 |
index 003af89c3a..5ea4db8ec6 100644 |
| 20 |
--- a/dev-lang/ruby/ruby-2.4.6.ebuild |
| 21 |
+++ b/dev-lang/ruby/ruby-2.4.6.ebuild |
| 22 |
@@ -78,10 +78,14 @@ src_prepare() { |
| 23 |
sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ |
| 24 |
configure.in || die "sed failed" |
| 25 |
# Fix hardcoded SHELL var in mkmf library |
| 26 |
- sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb |
| 27 |
+ sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die |
| 28 |
# avoid symlink loop on Darwin (?!) |
| 29 |
sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).dylib//' \ |
| 30 |
- configure.in || die "sed failed" |
| 31 |
+ configure.in || die |
| 32 |
+ # make ar/libtool hack for Darwin work |
| 33 |
+ sed -i \ |
| 34 |
+ -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ |
| 35 |
+ configure.in || die |
| 36 |
# Fix using installed ruby |
| 37 |
sed -i -e '/^libs << File.expand_path("lib", srcdir)/s/^/#/' \ |
| 38 |
tool/runruby.rb || die |
| 39 |
|
| 40 |
diff --git a/dev-lang/ruby/ruby-2.5.5.ebuild b/dev-lang/ruby/ruby-2.5.5.ebuild |
| 41 |
index c02ac06e74..177b65de97 100644 |
| 42 |
--- a/dev-lang/ruby/ruby-2.5.5.ebuild |
| 43 |
+++ b/dev-lang/ruby/ruby-2.5.5.ebuild |
| 44 |
@@ -73,10 +73,14 @@ src_prepare() { |
| 45 |
rm -fr ext/fiddle/libffi-3.2.1 || die |
| 46 |
|
| 47 |
# Fix hardcoded SHELL var in mkmf library |
| 48 |
- sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb |
| 49 |
+ sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die |
| 50 |
# avoid symlink loop on Darwin (?!) |
| 51 |
- sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).dylib//' \ |
| 52 |
- configure.ac || die "sed failed" |
| 53 |
+ sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ |
| 54 |
+ configure.ac || die |
| 55 |
+ # make ar/libtool hack for Darwin work |
| 56 |
+ sed -i \ |
| 57 |
+ -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ |
| 58 |
+ configure.ac || die |
| 59 |
|
| 60 |
eapply_user |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/dev-lang/ruby/ruby-2.6.3.ebuild b/dev-lang/ruby/ruby-2.6.3.ebuild |
| 64 |
index 02ade18d11..21cf31af81 100644 |
| 65 |
--- a/dev-lang/ruby/ruby-2.6.3.ebuild |
| 66 |
+++ b/dev-lang/ruby/ruby-2.6.3.ebuild |
| 67 |
@@ -76,10 +76,14 @@ src_prepare() { |
| 68 |
rm -fr ext/fiddle/libffi-3.2.1 || die |
| 69 |
|
| 70 |
# Fix hardcoded SHELL var in mkmf library |
| 71 |
- sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb |
| 72 |
+ sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die |
| 73 |
# avoid symlink loop on Darwin (?!) |
| 74 |
- sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).dylib//' \ |
| 75 |
- configure.ac || die "sed failed" |
| 76 |
+ sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ |
| 77 |
+ configure.ac || die |
| 78 |
+ # make ar/libtool hack for Darwin work |
| 79 |
+ sed -i \ |
| 80 |
+ -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ |
| 81 |
+ configure.ac || die |
| 82 |
|
| 83 |
eapply_user |
Archives