From 2f0298775dfe7e41ed696ed4d62b702d6fa914f4 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Mon, 6 Jun 2016 08:01:55 +0200 Subject: [PATCH] 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 --- dev-lang/ruby/ruby-2.1.10.ebuild | 2 +- dev-lang/ruby/ruby-2.1.9.ebuild | 2 +- dev-lang/ruby/ruby-2.2.5.ebuild | 2 +- dev-lang/ruby/ruby-2.3.0.ebuild | 2 +- dev-lang/ruby/ruby-2.3.1.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-lang/ruby/ruby-2.1.10.ebuild b/dev-lang/ruby/ruby-2.1.10.ebuild index 82cc4e6f9c83d..f49f79df6f221 100644 --- 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 2cafe171318bb..b4bac722c556f 100644 --- 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 16c694ba719be..dea3baeab1f2d 100644 --- 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 385a6f3935de0..98ec15525283d 100644 --- 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 2130164d79874..df7be55446820 100644 --- 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"