[gentoo-commits] repo/gentoo:master commit in: eclass/ELT-patches/aixrtl/

[Michael Haubenwallner]

commit:     4cc26176395a4cc2eb5dfe5133c4018bbcaca278
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 15:49:34 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 15:57:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc26176

ELT-patches/aixrtl: add shlibpath_overrides_runpath=yes, sync library_names_spec

 eclass/ELT-patches/aixrtl/1.5.0-soname     | 3 ++-
 eclass/ELT-patches/aixrtl/2.4.2.418-soname | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eclass/ELT-patches/aixrtl/1.5.0-soname 
b/eclass/ELT-patches/aixrtl/1.5.0-soname
index 113fe2d84e1..5c1806508c4 100644
--- a/eclass/ELT-patches/aixrtl/1.5.0-soname
+++ b/eclass/ELT-patches/aixrtl/1.5.0-soname
@@ -1,12 +1,13 @@
 --- configure
 +++ configure
-@@ -14426,7 +14426,8 @@
+@@ -14426,7 +14426,9 @@
        # If using run time linking (on AIX 4.2 or later) use lib<name>.so
        # instead of lib<name>.a to let people know that these are not
        # typical AIX shared libraries.
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      library_names_spec='$libname$release$shared_ext$major 
$libname$shared_ext'
 +      [ "${OBJECT_MODE:-32}" = '64' ] && 
soname_spec='$libname$release$shared_ext$major(shr_64.o)' || 
soname_spec='$libname$release$shared_ext$major(shr.o)'
++      shlibpath_overrides_runpath=yes
      else
        # We preserve .a as extension for shared libraries through AIX4.2
        # and later when we are not doing run time linking.

diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-soname 
b/eclass/ELT-patches/aixrtl/2.4.2.418-soname
index de3e93e8ae5..cb9e48fc0e8 100644
--- a/eclass/ELT-patches/aixrtl/2.4.2.418-soname
+++ b/eclass/ELT-patches/aixrtl/2.4.2.418-soname
@@ -1,10 +1,12 @@
 --- configure
 +++ configure
-@@ -14426,6 +14426,7 @@
+@@ -14426,6 +14426,8 @@
        # instead of lib<name>.a to let people know that these are not
        # typical AIX shared libraries.
-       library_names_spec='$libname$release$shared_ext$versuffix 
$libname$release$shared_ext$major $libname$shared_ext'
+-      library_names_spec='$libname$release$shared_ext$versuffix 
$libname$release$shared_ext$major $libname$shared_ext'
++      library_names_spec='$libname$release$shared_ext$major 
$libname$shared_ext'
 +      [ "${OBJECT_MODE:-32}" = '64' ] && 
soname_spec='$libname$release$shared_ext$major(shr_64.o)' || 
soname_spec='$libname$release$shared_ext$major(shr.o)'
++      shlibpath_overrides_runpath=yes
      else
        # We preserve .a as extension for shared libraries through AIX4.2
        # and later when we are not doing run time linking.