dev-lang/ruby: fix bootstrap build on uclibc

With a blank LIBPATHENV the ruby build tools fall back to using LD_PRELOAD
to load libruby.so during the build process. With uclibc, preloading is
now optional and not enabled at least in the vanilla stage3 that we
produce. This causes the build to fail since there are no options left
to find libruby.so.

Fixed by adding ${S} to the temporary LD_LIBRARY_PATH during the install
phase. Thanks to blueness for the original patch.

Fixes bug 564272

Package-Manager: portage-2.2.28

diff --git a/dev-lang/ruby/ruby-2.1.10.ebuild b/dev-lang/ruby/ruby-2.1.10.ebuild
index 82cc4e6f9c83d1b82f33a840615fb5338b7ea2ec..f49f79df6f221b385ffcc2e0eeca702e73019884 100644 (file)
--- a/dev-lang/ruby/ruby-2.1.10.ebuild
+++ b/dev-lang/ruby/ruby-2.1.10.ebuild
@@ -181,7 +181,7 @@ src_install() {
 
        local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 
-       LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+       LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
        for d in $(find "${S}/ext" -type d) ; do
                RUBYLIB="${RUBYLIB}:$d"

diff --git a/dev-lang/ruby/ruby-2.1.9.ebuild b/dev-lang/ruby/ruby-2.1.9.ebuild
index 2cafe171318bb8a36b4bc88022905b82e87c4874..b4bac722c556fcc05322f8a45f17611c796b8497 100644 (file)
--- a/dev-lang/ruby/ruby-2.1.9.ebuild
+++ b/dev-lang/ruby/ruby-2.1.9.ebuild
@@ -181,7 +181,7 @@ src_install() {
 
        local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 
-       LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+       LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
        for d in $(find "${S}/ext" -type d) ; do
                RUBYLIB="${RUBYLIB}:$d"

diff --git a/dev-lang/ruby/ruby-2.2.5.ebuild b/dev-lang/ruby/ruby-2.2.5.ebuild
index 16c694ba719be94efb8eac85b5eb7176c23c2d78..dea3baeab1f2d0c1e5ffa7208543b3fb0cee170b 100644 (file)
--- a/dev-lang/ruby/ruby-2.2.5.ebuild
+++ b/dev-lang/ruby/ruby-2.2.5.ebuild
@@ -195,7 +195,7 @@ src_install() {
 
        local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 
-       LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+       LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
        for d in $(find "${S}/ext" -type d) ; do
                RUBYLIB="${RUBYLIB}:$d"

diff --git a/dev-lang/ruby/ruby-2.3.0.ebuild b/dev-lang/ruby/ruby-2.3.0.ebuild
index 385a6f3935de00aba80f1f88b78258ae80f3cc99..98ec15525283d8fdf53b37913207972a06a9c933 100644 (file)
--- a/dev-lang/ruby/ruby-2.3.0.ebuild
+++ b/dev-lang/ruby/ruby-2.3.0.ebuild
@@ -191,7 +191,7 @@ src_install() {
 
        local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 
-       LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+       LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
        for d in $(find "${S}/ext" -type d) ; do
                RUBYLIB="${RUBYLIB}:$d"

diff --git a/dev-lang/ruby/ruby-2.3.1.ebuild b/dev-lang/ruby/ruby-2.3.1.ebuild
index 2130164d79874fdac69631522359a1897231cc69..df7be554468200d86aa3d79e25ce8a8d168bc726 100644 (file)
--- a/dev-lang/ruby/ruby-2.3.1.ebuild
+++ b/dev-lang/ruby/ruby-2.3.1.ebuild
@@ -191,7 +191,7 @@ src_install() {
 
        local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 
-       LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+       LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
        for d in $(find "${S}/ext" -type d) ; do
                RUBYLIB="${RUBYLIB}:$d"