| 1 |
commit: 550be1b9278fdbd713c29e6dff6833dc2ab4fb18 |
| 2 |
Author: Hans de Graaff <hans <AT> degraaff <DOT> org> |
| 3 |
AuthorDate: Mon May 30 16:57:53 2016 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 23 07:35:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=550be1b9 |
| 7 |
|
| 8 |
Remove legacy libruby.so link |
| 9 |
|
| 10 |
Our ebuilds for Ruby 1.8 and older versions installed an unversioned |
| 11 |
link called libruby.so. This method was flawed because the shared |
| 12 |
library is not ABI compatible and thus cannot be managed by switching a |
| 13 |
shared link. Later versions of Ruby ebuilds no longer install this link, |
| 14 |
but on old systems a dangling link may still be present. This can lead |
| 15 |
to problems with the cmake recipes for Ruby, bug 582672. |
| 16 |
|
| 17 |
This patch removes the link when removing symlinks as part of an eselect |
| 18 |
change. |
| 19 |
|
| 20 |
eselect-ruby/ruby.eselect | 8 ++++++++ |
| 21 |
1 file changed, 8 insertions(+) |
| 22 |
|
| 23 |
diff --git a/eselect-ruby/ruby.eselect b/eselect-ruby/ruby.eselect |
| 24 |
index efead1e..1a7f059 100644 |
| 25 |
--- a/eselect-ruby/ruby.eselect |
| 26 |
+++ b/eselect-ruby/ruby.eselect |
| 27 |
@@ -8,6 +8,7 @@ SVN_DATE="20161226" |
| 28 |
VERSION="20161226" |
| 29 |
|
| 30 |
bindir=/usr/bin |
| 31 |
+libdir=/usr/lib |
| 32 |
man1dir=/usr/share/man/man1 |
| 33 |
|
| 34 |
find_targets() { |
| 35 |
@@ -43,6 +44,13 @@ check_target() { |
| 36 |
remove_symlinks() { |
| 37 |
rm -f ${EROOT}${bindir}/{ruby,gem,irb,erb,ri,rdoc,testrb} && \ |
| 38 |
rm -f ${EROOT}${man1dir}/{ruby,irb,erb,ri}.1* |
| 39 |
+ |
| 40 |
+ # Remove unversioned legacy link set by ruby 1.8 and earlier |
| 41 |
+ # see bug 582672 |
| 42 |
+ local link="${EROOT}${libdir}/libruby.so" |
| 43 |
+ if [[ -e ${link} ]]; then |
| 44 |
+ rm -f ${link} |
| 45 |
+ fi |
| 46 |
} |
| 47 |
|
| 48 |
create_man_links() { |
Archives