From 0c0bbc9b54955ad136d0baa420fdc846001c4cd2 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Mon, 7 Jul 2014 08:45:14 +0000 Subject: elt/aixrtl: use similar filename even for 2.4.2.418 diffs --- eclass/ChangeLog | 7 ++++++- eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c | 11 +++++++++++ eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx | 11 +++++++++++ eclass/ELT-patches/aixrtl/2.4.2.418-cmds.c | 11 ----------- eclass/ELT-patches/aixrtl/2.4.2.418-cmds.cxx | 11 ----------- 5 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c create mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx delete mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-cmds.c delete mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-cmds.cxx (limited to 'eclass') diff --git a/eclass/ChangeLog b/eclass/ChangeLog index df6dbb3e51e1..694aae29ef30 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1314 2014/07/07 08:41:35 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1315 2014/07/07 08:45:14 haubi Exp $ + + 07 Jul 2014; Michael Haubenwallner + -ELT-patches/aixrtl/2.4.2.418-cmds.c, -ELT-patches/aixrtl/2.4.2.418-cmds.cxx, + +ELT-patches/aixrtl/2.4.2.418-cmds-c, +ELT-patches/aixrtl/2.4.2.418-cmds-cxx: + use similar filename even for 2.4.2.418 diffs 07 Jul 2014; Michael Haubenwallner ELT-patches/aixrtl/1.5.0-cmds-c, ELT-patches/aixrtl/1.5.0-cmds-cxx, diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c new file mode 100644 index 000000000000..815b15d8bcad --- /dev/null +++ b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -9214,7 +9214,7 @@ + fi + + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag ++ archive_expsym_cmds='eval `echo "$soname" | $SED -e "s,^,: ,; s,(, membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d' + else + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx new file mode 100644 index 000000000000..2e1ca5750a6d --- /dev/null +++ b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -13307,7 +13307,7 @@ + + hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" + +- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag ++ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(, membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d' + else + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds.c b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds.c deleted file mode 100644 index 815b15d8bcad..000000000000 --- a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds.c +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -9214,7 +9214,7 @@ - fi - - hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag -+ archive_expsym_cmds='eval `echo "$soname" | $SED -e "s,^,: ,; s,(, membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d' - else - if test ia64 = "$host_cpu"; then - hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds.cxx b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds.cxx deleted file mode 100644 index 2e1ca5750a6d..000000000000 --- a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -13307,7 +13307,7 @@ - - hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" - -- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag -+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(, membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d' - else - if test ia64 = "$host_cpu"; then - hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' -- cgit v1.2.3-65-gdbad