| 1 |
commit: 74d885ce487911cae6b2d4c596d98dc25d2865a6 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 28 17:20:07 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 28 17:20:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/ppc64le.git/commit/?id=74d885ce |
| 7 |
|
| 8 |
eclass/libtool.eclass + ELT-patches: copy from tree |
| 9 |
|
| 10 |
eclass/ELT-patches/aixrtl/1.5.0-cmds-c | 11 + |
| 11 |
eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx | 11 + |
| 12 |
eclass/ELT-patches/aixrtl/1.5.0-expsym-c | 14 + |
| 13 |
eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx | 14 + |
| 14 |
eclass/ELT-patches/aixrtl/1.5.0-noundef-c | 11 + |
| 15 |
eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx | 11 + |
| 16 |
eclass/ELT-patches/aixrtl/1.5.0-soname | 12 + |
| 17 |
eclass/ELT-patches/aixrtl/1.5.0-usertl-c | 10 + |
| 18 |
eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx | 10 + |
| 19 |
eclass/ELT-patches/aixrtl/1.5.22-cmds-c | 11 + |
| 20 |
eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx | 11 + |
| 21 |
eclass/ELT-patches/aixrtl/2.0.0-fpic-c | 12 + |
| 22 |
eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx | 12 + |
| 23 |
eclass/ELT-patches/aixrtl/2.2.0-cmds-c | 11 + |
| 24 |
eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx | 11 + |
| 25 |
eclass/ELT-patches/aixrtl/2.2.0-expsym-c | 14 + |
| 26 |
eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx | 14 + |
| 27 |
eclass/ELT-patches/aixrtl/2.2.0-noundef-c | 11 + |
| 28 |
eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx | 11 + |
| 29 |
eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx | 10 + |
| 30 |
eclass/ELT-patches/aixrtl/2.2.8-cmds-c | 11 + |
| 31 |
eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx | 11 + |
| 32 |
eclass/ELT-patches/aixrtl/2.4.0-expsym-c | 14 + |
| 33 |
eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx | 14 + |
| 34 |
eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c | 11 + |
| 35 |
eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx | 11 + |
| 36 |
eclass/ELT-patches/aixrtl/2.4.2.418-soname | 10 + |
| 37 |
eclass/ELT-patches/aixrtl/2.4.4-with-svr4 | 11 + |
| 38 |
eclass/ELT-patches/as-needed/1.5 | 30 ++ |
| 39 |
eclass/ELT-patches/as-needed/1.5.26 | 38 ++ |
| 40 |
eclass/ELT-patches/as-needed/2.2.6 | 38 ++ |
| 41 |
eclass/ELT-patches/as-needed/2.4.2 | 38 ++ |
| 42 |
eclass/ELT-patches/as-needed/2.4.3 | 38 ++ |
| 43 |
eclass/ELT-patches/cross/2.2 | 20 + |
| 44 |
eclass/ELT-patches/cross/2.4 | 20 + |
| 45 |
eclass/ELT-patches/cross/2.4.3 | 21 + |
| 46 |
eclass/ELT-patches/darwin-conf/1.5 | 24 + |
| 47 |
eclass/ELT-patches/darwin-conf/1.5b | 33 ++ |
| 48 |
eclass/ELT-patches/darwin-conf/2.2.4 | 29 ++ |
| 49 |
eclass/ELT-patches/darwin-conf/2.2.6 | 43 ++ |
| 50 |
eclass/ELT-patches/darwin-conf/2.4.6 | 29 ++ |
| 51 |
eclass/ELT-patches/darwin-ltconf/1.2.0 | 66 +++ |
| 52 |
eclass/ELT-patches/darwin-ltconf/1.3.0 | 67 +++ |
| 53 |
eclass/ELT-patches/darwin-ltmain/1.2.0 | 40 ++ |
| 54 |
eclass/ELT-patches/darwin-ltmain/1.3.0 | 64 +++ |
| 55 |
eclass/ELT-patches/deplibs/1.5 | 18 + |
| 56 |
eclass/ELT-patches/deplibs/2.1b | 18 + |
| 57 |
eclass/ELT-patches/fbsd-conf/00broken-libglade | 33 ++ |
| 58 |
eclass/ELT-patches/fbsd-conf/1.4.0 | 32 ++ |
| 59 |
eclass/ELT-patches/fbsd-conf/1.5.10 | 120 +++++ |
| 60 |
eclass/ELT-patches/fbsd-conf/1.5.18 | 116 +++++ |
| 61 |
eclass/ELT-patches/fbsd-conf/1.5.20 | 116 +++++ |
| 62 |
eclass/ELT-patches/fbsd-conf/1.5.20b | 61 +++ |
| 63 |
eclass/ELT-patches/fbsd-conf/1.9f | 60 +++ |
| 64 |
eclass/ELT-patches/fbsd-ltconf/1.2.0 | 26 ++ |
| 65 |
eclass/ELT-patches/fbsd-ltconf/1.3.0 | 32 ++ |
| 66 |
eclass/ELT-patches/fbsd-ltconf/1.4a | 32 ++ |
| 67 |
eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 | 32 ++ |
| 68 |
eclass/ELT-patches/fix-relink/1.4.0 | 63 +++ |
| 69 |
eclass/ELT-patches/fix-relink/1.4.3 | 62 +++ |
| 70 |
eclass/ELT-patches/fix-relink/1.5.0 | 51 +++ |
| 71 |
eclass/ELT-patches/gold-conf/2.2.6 | 10 + |
| 72 |
eclass/ELT-patches/hardcode-relink/1.3d | 8 + |
| 73 |
eclass/ELT-patches/hardcode/1.3d | 21 + |
| 74 |
eclass/ELT-patches/hardcode/2.1b | 36 ++ |
| 75 |
eclass/ELT-patches/hc-flag-ld/1.5 | 18 + |
| 76 |
eclass/ELT-patches/hpux-conf/1.5.22-syslibpath | 24 + |
| 77 |
eclass/ELT-patches/install-sh/1.5 | 14 + |
| 78 |
eclass/ELT-patches/install-sh/1.5.4 | 14 + |
| 79 |
eclass/ELT-patches/install-sh/1.5.6 | 14 + |
| 80 |
eclass/ELT-patches/irix-ltmain/2.2.6 | 30 ++ |
| 81 |
eclass/ELT-patches/ltmain/1.5 | 18 + |
| 82 |
eclass/ELT-patches/max_cmd_len/1.5.0 | 33 ++ |
| 83 |
eclass/ELT-patches/max_cmd_len/1.5.14 | 33 ++ |
| 84 |
eclass/ELT-patches/max_cmd_len/1.5.20 | 33 ++ |
| 85 |
eclass/ELT-patches/mint-conf/2.2.6 | 15 + |
| 86 |
eclass/ELT-patches/no-lc/1.3d | 13 + |
| 87 |
eclass/ELT-patches/no-lc/1.5.22 | 11 + |
| 88 |
eclass/ELT-patches/nocxx/nocxx-2.64.patch | 13 + |
| 89 |
eclass/ELT-patches/nocxx/nocxx.patch | 15 + |
| 90 |
eclass/ELT-patches/portage/1.2.0 | 7 + |
| 91 |
eclass/ELT-patches/portage/1.3.0c | 66 +++ |
| 92 |
eclass/ELT-patches/portage/1.3.3 | 71 +++ |
| 93 |
eclass/ELT-patches/portage/1.4.0 | 74 ++++ |
| 94 |
eclass/ELT-patches/portage/1.5.10 | 77 ++++ |
| 95 |
eclass/ELT-patches/portage/2.2 | 69 +++ |
| 96 |
eclass/ELT-patches/relink-prog/1.3d | 24 + |
| 97 |
eclass/ELT-patches/relink-prog/2.1b | 24 + |
| 98 |
eclass/ELT-patches/relink/1.4.0a | 99 +++++ |
| 99 |
eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 | 99 +++++ |
| 100 |
eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 | 100 +++++ |
| 101 |
eclass/ELT-patches/relink/1.4.1 | 124 ++++++ |
| 102 |
eclass/ELT-patches/relink/1.4.2 | 99 +++++ |
| 103 |
eclass/ELT-patches/relink/1.4.3 | 111 +++++ |
| 104 |
eclass/ELT-patches/rem-int-dep/1.3.5 | 11 + |
| 105 |
eclass/ELT-patches/sed/1.3.4 | 14 + |
| 106 |
eclass/ELT-patches/sed/1.4.0 | 14 + |
| 107 |
eclass/ELT-patches/sed/1.5.6 | 16 + |
| 108 |
eclass/ELT-patches/sol2-conf/2.4.2 | 14 + |
| 109 |
eclass/ELT-patches/sol2-ltmain/2.4.2 | 11 + |
| 110 |
eclass/ELT-patches/sys-lib-dlsearch/2.4 | 21 + |
| 111 |
eclass/ELT-patches/target-nm/2.4.2 | 45 ++ |
| 112 |
eclass/ELT-patches/test/1.4.0 | 291 +++++++++++++ |
| 113 |
eclass/ELT-patches/test/1.4.2 | 578 +++++++++++++++++++++++++ |
| 114 |
eclass/ELT-patches/tmp/1.3.5 | 15 + |
| 115 |
eclass/ELT-patches/uclibc-conf/1.2.0 | 48 ++ |
| 116 |
eclass/ELT-patches/uclibc-conf/1.3.0c | 48 ++ |
| 117 |
eclass/ELT-patches/uclibc-ltconf/1.2.0 | 36 ++ |
| 118 |
eclass/ELT-patches/uclibc-ltconf/1.3.0 | 39 ++ |
| 119 |
eclass/libtool.eclass | 514 ++++++++++++++++++++++ |
| 120 |
110 files changed, 4967 insertions(+) |
| 121 |
|
| 122 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-cmds-c b/eclass/ELT-patches/aixrtl/1.5.0-cmds-c |
| 123 |
new file mode 100644 |
| 124 |
index 0000000..9be0568 |
| 125 |
--- /dev/null |
| 126 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-cmds-c |
| 127 |
@@ -0,0 +1,11 @@ |
| 128 |
+--- configure |
| 129 |
++++ configure |
| 130 |
+@@ -7234,7 +7235,7 @@ |
| 131 |
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 132 |
+ |
| 133 |
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 134 |
+- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 135 |
++ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 136 |
+ else |
| 137 |
+ if test "$host_cpu" = ia64; then |
| 138 |
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
| 139 |
|
| 140 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx b/eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx |
| 141 |
new file mode 100644 |
| 142 |
index 0000000..13ffb7a |
| 143 |
--- /dev/null |
| 144 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx |
| 145 |
@@ -0,0 +1,11 @@ |
| 146 |
+--- configure |
| 147 |
++++ configure |
| 148 |
+@@ -10041,7 +10043,7 @@ |
| 149 |
+ |
| 150 |
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 151 |
+ |
| 152 |
+- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 153 |
++ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 154 |
+ else |
| 155 |
+ if test "$host_cpu" = ia64; then |
| 156 |
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
| 157 |
|
| 158 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-expsym-c b/eclass/ELT-patches/aixrtl/1.5.0-expsym-c |
| 159 |
new file mode 100644 |
| 160 |
index 0000000..2b54887 |
| 161 |
--- /dev/null |
| 162 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-expsym-c |
| 163 |
@@ -0,0 +1,14 @@ |
| 164 |
+--- configure |
| 165 |
++++ configure |
| 166 |
+@@ -7113,9 +7113,9 @@ |
| 167 |
+ # If we're using GNU nm, then we don't want the "-C" option. |
| 168 |
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm |
| 169 |
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then |
| 170 |
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
| 171 |
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
| 172 |
+ else |
| 173 |
+- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
| 174 |
++ export_symbols_cmds='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
| 175 |
+ fi |
| 176 |
+ aix_use_runtimelinking=no |
| 177 |
+ |
| 178 |
|
| 179 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx b/eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx |
| 180 |
new file mode 100644 |
| 181 |
index 0000000..9b6bdc2 |
| 182 |
--- /dev/null |
| 183 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx |
| 184 |
@@ -0,0 +1,14 @@ |
| 185 |
+--- configure |
| 186 |
++++ configure |
| 187 |
+@@ -11217,9 +11217,9 @@ |
| 188 |
+ # If we're using GNU nm, then we don't want the "-C" option. |
| 189 |
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm |
| 190 |
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then |
| 191 |
+- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
| 192 |
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
| 193 |
+ else |
| 194 |
+- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
| 195 |
++ export_symbols_cmds_CXX='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
| 196 |
+ fi |
| 197 |
+ ;; |
| 198 |
+ pw32*) |
| 199 |
|
| 200 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-noundef-c b/eclass/ELT-patches/aixrtl/1.5.0-noundef-c |
| 201 |
new file mode 100644 |
| 202 |
index 0000000..c893f9c |
| 203 |
--- /dev/null |
| 204 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-noundef-c |
| 205 |
@@ -0,0 +1,11 @@ |
| 206 |
+--- configure |
| 207 |
++++ configure |
| 208 |
+@@ -7189,7 +7190,7 @@ |
| 209 |
+ if test "$aix_use_runtimelinking" = yes; then |
| 210 |
+ # Warning - without using the other runtime loading flags (-brtl), |
| 211 |
+ # -berok will link without error, but may produce a broken library. |
| 212 |
+- allow_undefined_flag='-berok' |
| 213 |
++ no_undefined_flag=' ${wl}-bernotok' |
| 214 |
+ # Determine the default libpath from the value encoded in an empty executable. |
| 215 |
+ cat >conftest.$ac_ext <<_ACEOF |
| 216 |
+ #line $LINENO "configure" |
| 217 |
|
| 218 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx b/eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx |
| 219 |
new file mode 100644 |
| 220 |
index 0000000..dc01fca |
| 221 |
--- /dev/null |
| 222 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx |
| 223 |
@@ -0,0 +1,11 @@ |
| 224 |
+--- configure |
| 225 |
++++ configure |
| 226 |
+@@ -9995,7 +9997,7 @@ |
| 227 |
+ if test "$aix_use_runtimelinking" = yes; then |
| 228 |
+ # Warning - without using the other runtime loading flags (-brtl), |
| 229 |
+ # -berok will link without error, but may produce a broken library. |
| 230 |
+- allow_undefined_flag_CXX='-berok' |
| 231 |
++ no_undefined_flag_CXX=' ${wl}-bernotok' |
| 232 |
+ # Determine the default libpath from the value encoded in an empty executable. |
| 233 |
+ cat >conftest.$ac_ext <<_ACEOF |
| 234 |
+ #line $LINENO "configure" |
| 235 |
|
| 236 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-soname b/eclass/ELT-patches/aixrtl/1.5.0-soname |
| 237 |
new file mode 100644 |
| 238 |
index 0000000..113fe2d |
| 239 |
--- /dev/null |
| 240 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-soname |
| 241 |
@@ -0,0 +1,12 @@ |
| 242 |
+--- configure |
| 243 |
++++ configure |
| 244 |
+@@ -14426,7 +14426,8 @@ |
| 245 |
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so |
| 246 |
+ # instead of lib<name>.a to let people know that these are not |
| 247 |
+ # typical AIX shared libraries. |
| 248 |
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
| 249 |
++ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' |
| 250 |
++ [ "${OBJECT_MODE:-32}" = '64' ] && soname_spec='$libname$release$shared_ext$major(shr_64.o)' || soname_spec='$libname$release$shared_ext$major(shr.o)' |
| 251 |
+ else |
| 252 |
+ # We preserve .a as extension for shared libraries through AIX4.2 |
| 253 |
+ # and later when we are not doing run time linking. |
| 254 |
|
| 255 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-usertl-c b/eclass/ELT-patches/aixrtl/1.5.0-usertl-c |
| 256 |
new file mode 100644 |
| 257 |
index 0000000..b5ff186 |
| 258 |
--- /dev/null |
| 259 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-usertl-c |
| 260 |
@@ -0,0 +1,10 @@ |
| 261 |
+--- configure |
| 262 |
++++ configure |
| 263 |
+@@ -7130,6 +7130,7 @@ |
| 264 |
+ fi |
| 265 |
+ done |
| 266 |
+ esac |
| 267 |
++ aix_use_runtimelinking=yes |
| 268 |
+ |
| 269 |
+ exp_sym_flag='-bexport' |
| 270 |
+ no_entry_flag='-bnoentry' |
| 271 |
|
| 272 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx b/eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx |
| 273 |
new file mode 100644 |
| 274 |
index 0000000..36c84e9 |
| 275 |
--- /dev/null |
| 276 |
+++ b/eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx |
| 277 |
@@ -0,0 +1,10 @@ |
| 278 |
+--- configure |
| 279 |
++++ configure |
| 280 |
+@@ -9936,6 +9937,7 @@ |
| 281 |
+ esac |
| 282 |
+ done |
| 283 |
+ esac |
| 284 |
++ aix_use_runtimelinking=yes |
| 285 |
+ |
| 286 |
+ exp_sym_flag='-bexport' |
| 287 |
+ no_entry_flag='-bnoentry' |
| 288 |
|
| 289 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-cmds-c b/eclass/ELT-patches/aixrtl/1.5.22-cmds-c |
| 290 |
new file mode 100644 |
| 291 |
index 0000000..a97485a |
| 292 |
--- /dev/null |
| 293 |
+++ b/eclass/ELT-patches/aixrtl/1.5.22-cmds-c |
| 294 |
@@ -0,0 +1,11 @@ |
| 295 |
+--- configure |
| 296 |
++++ configure |
| 297 |
+@@ -8679,7 +8679,7 @@ |
| 298 |
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 299 |
+ |
| 300 |
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 301 |
+- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 302 |
++ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 303 |
+ else |
| 304 |
+ if test "$host_cpu" = ia64; then |
| 305 |
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
| 306 |
|
| 307 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx b/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx |
| 308 |
new file mode 100644 |
| 309 |
index 0000000..222a0f7 |
| 310 |
--- /dev/null |
| 311 |
+++ b/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx |
| 312 |
@@ -0,0 +1,11 @@ |
| 313 |
+--- configure |
| 314 |
++++ configure |
| 315 |
+@@ -11731,7 +11731,7 @@ |
| 316 |
+ |
| 317 |
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 318 |
+ |
| 319 |
+- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 320 |
++ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 321 |
+ else |
| 322 |
+ if test "$host_cpu" = ia64; then |
| 323 |
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
| 324 |
|
| 325 |
diff --git a/eclass/ELT-patches/aixrtl/2.0.0-fpic-c b/eclass/ELT-patches/aixrtl/2.0.0-fpic-c |
| 326 |
new file mode 100644 |
| 327 |
index 0000000..bb3cb42 |
| 328 |
--- /dev/null |
| 329 |
+++ b/eclass/ELT-patches/aixrtl/2.0.0-fpic-c |
| 330 |
@@ -0,0 +1,12 @@ |
| 331 |
+--- configure |
| 332 |
++++ configure |
| 333 |
+@@ -1,6 +1,9 @@ |
| 334 |
+ if test "$host_cpu" = ia64; then |
| 335 |
+ # AIX 5 now supports IA64 processor |
| 336 |
+ lt_prog_compiler_static='-Bstatic' |
| 337 |
++ lt_prog_compiler_pic='-fPIC' |
| 338 |
++ else |
| 339 |
++ lt_prog_compiler_pic='-fPIC' |
| 340 |
+ fi |
| 341 |
+ ;; |
| 342 |
+ |
| 343 |
|
| 344 |
diff --git a/eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx b/eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx |
| 345 |
new file mode 100644 |
| 346 |
index 0000000..532bbcf |
| 347 |
--- /dev/null |
| 348 |
+++ b/eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx |
| 349 |
@@ -0,0 +1,12 @@ |
| 350 |
+--- configure |
| 351 |
++++ configure |
| 352 |
+@@ -1,6 +1,9 @@ |
| 353 |
+ if test "$host_cpu" = ia64; then |
| 354 |
+ # AIX 5 now supports IA64 processor |
| 355 |
+ lt_prog_compiler_static_CXX='-Bstatic' |
| 356 |
++ lt_prog_compiler_pic_CXX='-fPIC' |
| 357 |
++ else |
| 358 |
++ lt_prog_compiler_pic_CXX='-fPIC' |
| 359 |
+ fi |
| 360 |
+ ;; |
| 361 |
+ |
| 362 |
|
| 363 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-cmds-c b/eclass/ELT-patches/aixrtl/2.2.0-cmds-c |
| 364 |
new file mode 100644 |
| 365 |
index 0000000..6c2cd7e |
| 366 |
--- /dev/null |
| 367 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-cmds-c |
| 368 |
@@ -0,0 +1,11 @@ |
| 369 |
+--- configure |
| 370 |
++++ configure |
| 371 |
+@@ -8619,7 +8619,7 @@ |
| 372 |
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 373 |
+ |
| 374 |
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 375 |
+- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 376 |
++ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 377 |
+ else |
| 378 |
+ if test "$host_cpu" = ia64; then |
| 379 |
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
| 380 |
|
| 381 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx b/eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx |
| 382 |
new file mode 100644 |
| 383 |
index 0000000..af3c7b7 |
| 384 |
--- /dev/null |
| 385 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx |
| 386 |
@@ -0,0 +1,11 @@ |
| 387 |
+--- configure |
| 388 |
++++ configure |
| 389 |
+@@ -13946,7 +13947,7 @@ |
| 390 |
+ |
| 391 |
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 392 |
+ |
| 393 |
+- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 394 |
++ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 395 |
+ else |
| 396 |
+ if test "$host_cpu" = ia64; then |
| 397 |
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
| 398 |
|
| 399 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-expsym-c b/eclass/ELT-patches/aixrtl/2.2.0-expsym-c |
| 400 |
new file mode 100644 |
| 401 |
index 0000000..196a5a3 |
| 402 |
--- /dev/null |
| 403 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-expsym-c |
| 404 |
@@ -0,0 +1,14 @@ |
| 405 |
+--- configure |
| 406 |
++++ configure |
| 407 |
+@@ -8475,9 +8475,9 @@ |
| 408 |
+ # If we're using GNU nm, then we don't want the "-C" option. |
| 409 |
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm |
| 410 |
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
| 411 |
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 412 |
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
| 413 |
+ else |
| 414 |
+- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 415 |
++ export_symbols_cmds='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
| 416 |
+ fi |
| 417 |
+ aix_use_runtimelinking=no |
| 418 |
+ |
| 419 |
|
| 420 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx b/eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx |
| 421 |
new file mode 100644 |
| 422 |
index 0000000..ee4d163 |
| 423 |
--- /dev/null |
| 424 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx |
| 425 |
@@ -0,0 +1,14 @@ |
| 426 |
+--- configure |
| 427 |
++++ configure |
| 428 |
+@@ -15506,9 +15506,9 @@ |
| 429 |
+ # If we're using GNU nm, then we don't want the "-C" option. |
| 430 |
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm |
| 431 |
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
| 432 |
+- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 433 |
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
| 434 |
+ else |
| 435 |
+- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 436 |
++ export_symbols_cmds_CXX='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
| 437 |
+ fi |
| 438 |
+ ;; |
| 439 |
+ pw32*) |
| 440 |
|
| 441 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-noundef-c b/eclass/ELT-patches/aixrtl/2.2.0-noundef-c |
| 442 |
new file mode 100644 |
| 443 |
index 0000000..d9520cb |
| 444 |
--- /dev/null |
| 445 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-noundef-c |
| 446 |
@@ -0,0 +1,11 @@ |
| 447 |
+--- configure |
| 448 |
++++ configure |
| 449 |
+@@ -8558,7 +8558,7 @@ |
| 450 |
+ if test "$aix_use_runtimelinking" = yes; then |
| 451 |
+ # Warning - without using the other runtime loading flags (-brtl), |
| 452 |
+ # -berok will link without error, but may produce a broken library. |
| 453 |
+- allow_undefined_flag='-berok' |
| 454 |
++ no_undefined_flag=' ${wl}-bernotok' |
| 455 |
+ # Determine the default libpath from the value encoded in an |
| 456 |
+ # empty executable. |
| 457 |
+ cat >conftest.$ac_ext <<_ACEOF |
| 458 |
|
| 459 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx b/eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx |
| 460 |
new file mode 100644 |
| 461 |
index 0000000..37d02db |
| 462 |
--- /dev/null |
| 463 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx |
| 464 |
@@ -0,0 +1,11 @@ |
| 465 |
+--- configure |
| 466 |
++++ configure |
| 467 |
+@@ -13884,7 +13885,7 @@ |
| 468 |
+ if test "$aix_use_runtimelinking" = yes; then |
| 469 |
+ # Warning - without using the other runtime loading flags (-brtl), |
| 470 |
+ # -berok will link without error, but may produce a broken library. |
| 471 |
+- allow_undefined_flag_CXX='-berok' |
| 472 |
++ no_undefined_flag_CXX=' ${wl}-bernotok' |
| 473 |
+ # Determine the default libpath from the value encoded in an empty |
| 474 |
+ # executable. |
| 475 |
+ cat >conftest.$ac_ext <<_ACEOF |
| 476 |
|
| 477 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx b/eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx |
| 478 |
new file mode 100644 |
| 479 |
index 0000000..c59a093 |
| 480 |
--- /dev/null |
| 481 |
+++ b/eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx |
| 482 |
@@ -0,0 +1,10 @@ |
| 483 |
+--- configure |
| 484 |
++++ configure |
| 485 |
+@@ -13819,6 +13819,7 @@ |
| 486 |
+ done |
| 487 |
+ ;; |
| 488 |
+ esac |
| 489 |
++ aix_use_runtimelinking=yes |
| 490 |
+ |
| 491 |
+ exp_sym_flag='-bexport' |
| 492 |
+ no_entry_flag='-bnoentry' |
| 493 |
|
| 494 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.8-cmds-c b/eclass/ELT-patches/aixrtl/2.2.8-cmds-c |
| 495 |
new file mode 100644 |
| 496 |
index 0000000..e1e0934 |
| 497 |
--- /dev/null |
| 498 |
+++ b/eclass/ELT-patches/aixrtl/2.2.8-cmds-c |
| 499 |
@@ -0,0 +1,11 @@ |
| 500 |
+--- configure |
| 501 |
++++ configure |
| 502 |
+@@ -9214,7 +9214,7 @@ |
| 503 |
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 504 |
+ |
| 505 |
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 506 |
+- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 507 |
++ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 508 |
+ else |
| 509 |
+ if test "$host_cpu" = ia64; then |
| 510 |
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
| 511 |
|
| 512 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx b/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx |
| 513 |
new file mode 100644 |
| 514 |
index 0000000..7a31f66 |
| 515 |
--- /dev/null |
| 516 |
+++ b/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx |
| 517 |
@@ -0,0 +1,11 @@ |
| 518 |
+--- configure |
| 519 |
++++ configure |
| 520 |
+@@ -13307,7 +13307,7 @@ |
| 521 |
+ |
| 522 |
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 523 |
+ |
| 524 |
+- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 525 |
++ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $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 -f -r $lib.d' |
| 526 |
+ else |
| 527 |
+ if test "$host_cpu" = ia64; then |
| 528 |
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
| 529 |
|
| 530 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.0-expsym-c b/eclass/ELT-patches/aixrtl/2.4.0-expsym-c |
| 531 |
new file mode 100644 |
| 532 |
index 0000000..6860317 |
| 533 |
--- /dev/null |
| 534 |
+++ b/eclass/ELT-patches/aixrtl/2.4.0-expsym-c |
| 535 |
@@ -0,0 +1,14 @@ |
| 536 |
+--- configure |
| 537 |
++++ configure |
| 538 |
+@@ -9660,9 +9660,9 @@ |
| 539 |
+ # Also, AIX nm treats weak defined symbols like other global |
| 540 |
+ # defined symbols, whereas GNU nm marks them as "W". |
| 541 |
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
| 542 |
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 543 |
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
| 544 |
+ else |
| 545 |
+- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 546 |
++ export_symbols_cmds='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
| 547 |
+ fi |
| 548 |
+ aix_use_runtimelinking=no |
| 549 |
+ |
| 550 |
|
| 551 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx b/eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx |
| 552 |
new file mode 100644 |
| 553 |
index 0000000..ca9fd97 |
| 554 |
--- /dev/null |
| 555 |
+++ b/eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx |
| 556 |
@@ -0,0 +1,14 @@ |
| 557 |
+--- configure |
| 558 |
++++ configure |
| 559 |
+@@ -15711,9 +15711,9 @@ |
| 560 |
+ # Also, AIX nm treats weak defined symbols like other global defined |
| 561 |
+ # symbols, whereas GNU nm marks them as "W". |
| 562 |
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
| 563 |
+- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 564 |
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
| 565 |
+ else |
| 566 |
+- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
| 567 |
++ export_symbols_cmds_CXX='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
| 568 |
+ fi |
| 569 |
+ ;; |
| 570 |
+ pw32*) |
| 571 |
|
| 572 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c |
| 573 |
new file mode 100644 |
| 574 |
index 0000000..d92ce34 |
| 575 |
--- /dev/null |
| 576 |
+++ b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c |
| 577 |
@@ -0,0 +1,11 @@ |
| 578 |
+--- configure |
| 579 |
++++ configure |
| 580 |
+@@ -9214,7 +9214,7 @@ |
| 581 |
+ fi |
| 582 |
+ |
| 583 |
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" |
| 584 |
+- 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 |
| 585 |
++ 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' |
| 586 |
+ else |
| 587 |
+ if test ia64 = "$host_cpu"; then |
| 588 |
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' |
| 589 |
|
| 590 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx |
| 591 |
new file mode 100644 |
| 592 |
index 0000000..851be27 |
| 593 |
--- /dev/null |
| 594 |
+++ b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx |
| 595 |
@@ -0,0 +1,11 @@ |
| 596 |
+--- configure |
| 597 |
++++ configure |
| 598 |
+@@ -13307,7 +13307,7 @@ |
| 599 |
+ |
| 600 |
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" |
| 601 |
+ |
| 602 |
+- 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 |
| 603 |
++ 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' |
| 604 |
+ else |
| 605 |
+ if test ia64 = "$host_cpu"; then |
| 606 |
+ hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' |
| 607 |
|
| 608 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-soname b/eclass/ELT-patches/aixrtl/2.4.2.418-soname |
| 609 |
new file mode 100644 |
| 610 |
index 0000000..de3e93e |
| 611 |
--- /dev/null |
| 612 |
+++ b/eclass/ELT-patches/aixrtl/2.4.2.418-soname |
| 613 |
@@ -0,0 +1,10 @@ |
| 614 |
+--- configure |
| 615 |
++++ configure |
| 616 |
+@@ -14426,6 +14426,7 @@ |
| 617 |
+ # instead of lib<name>.a to let people know that these are not |
| 618 |
+ # typical AIX shared libraries. |
| 619 |
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
| 620 |
++ [ "${OBJECT_MODE:-32}" = '64' ] && soname_spec='$libname$release$shared_ext$major(shr_64.o)' || soname_spec='$libname$release$shared_ext$major(shr.o)' |
| 621 |
+ else |
| 622 |
+ # We preserve .a as extension for shared libraries through AIX4.2 |
| 623 |
+ # and later when we are not doing run time linking. |
| 624 |
|
| 625 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.4-with-svr4 b/eclass/ELT-patches/aixrtl/2.4.4-with-svr4 |
| 626 |
new file mode 100644 |
| 627 |
index 0000000..f356ea9 |
| 628 |
--- /dev/null |
| 629 |
+++ b/eclass/ELT-patches/aixrtl/2.4.4-with-svr4 |
| 630 |
@@ -0,0 +1,11 @@ |
| 631 |
+--- configure |
| 632 |
++++ configure |
| 633 |
+@@ -10835,7 +10835,7 @@ |
| 634 |
+ if ${lt_cv_with_aix_soname+:} false; then : |
| 635 |
+ $as_echo_n "(cached) " >&6 |
| 636 |
+ else |
| 637 |
+- lt_cv_with_aix_soname=aix |
| 638 |
++ lt_cv_with_aix_soname=svr4 |
| 639 |
+ fi |
| 640 |
+ |
| 641 |
+ with_aix_soname=$lt_cv_with_aix_soname |
| 642 |
|
| 643 |
diff --git a/eclass/ELT-patches/as-needed/1.5 b/eclass/ELT-patches/as-needed/1.5 |
| 644 |
new file mode 100644 |
| 645 |
index 0000000..01759c9 |
| 646 |
--- /dev/null |
| 647 |
+++ b/eclass/ELT-patches/as-needed/1.5 |
| 648 |
@@ -0,0 +1,30 @@ |
| 649 |
+--- ltmain.sh.orig 2006-03-29 15:45:36.000000000 +0200 |
| 650 |
++++ ltmain.sh 2006-03-29 16:39:30.000000000 +0200 |
| 651 |
+@@ -1754,6 +1754,11 @@ |
| 652 |
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` |
| 653 |
+ ;; |
| 654 |
+ |
| 655 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 656 |
++ deplibs="$deplibs $arg" |
| 657 |
++ continue |
| 658 |
++ ;; |
| 659 |
++ |
| 660 |
+ -Wl,*) |
| 661 |
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` |
| 662 |
+ arg= |
| 663 |
+@@ -2094,6 +2099,15 @@ |
| 664 |
+ lib= |
| 665 |
+ found=no |
| 666 |
+ case $deplib in |
| 667 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 668 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 669 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 670 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 671 |
++ else |
| 672 |
++ deplibs="$deplib $deplibs" |
| 673 |
++ fi |
| 674 |
++ continue |
| 675 |
++ ;; |
| 676 |
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) |
| 677 |
+ if test "$linkmode,$pass" = "prog,link"; then |
| 678 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 679 |
|
| 680 |
diff --git a/eclass/ELT-patches/as-needed/1.5.26 b/eclass/ELT-patches/as-needed/1.5.26 |
| 681 |
new file mode 100644 |
| 682 |
index 0000000..6836c55 |
| 683 |
--- /dev/null |
| 684 |
+++ b/eclass/ELT-patches/as-needed/1.5.26 |
| 685 |
@@ -0,0 +1,38 @@ |
| 686 |
+--- ltmain.sh.orig 2009-04-18 16:51:52.000000000 +0200 |
| 687 |
++++ ltmain.sh 2009-04-18 16:55:05.000000000 +0200 |
| 688 |
+@@ -1812,10 +1812,15 @@ |
| 689 |
+ done |
| 690 |
+ IFS="$save_ifs" |
| 691 |
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` |
| 692 |
+ ;; |
| 693 |
+ |
| 694 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 695 |
++ deplibs="$deplibs $arg" |
| 696 |
++ continue |
| 697 |
++ ;; |
| 698 |
++ |
| 699 |
+ -Wl,*) |
| 700 |
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` |
| 701 |
+ arg= |
| 702 |
+ save_ifs="$IFS"; IFS=',' |
| 703 |
+ for flag in $args; do |
| 704 |
+@@ -2152,10 +2157,19 @@ |
| 705 |
+ fi |
| 706 |
+ for deplib in $libs; do |
| 707 |
+ lib= |
| 708 |
+ found=no |
| 709 |
+ case $deplib in |
| 710 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 711 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 712 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 713 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 714 |
++ else |
| 715 |
++ deplibs="$deplib $deplibs" |
| 716 |
++ fi |
| 717 |
++ continue |
| 718 |
++ ;; |
| 719 |
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
| 720 |
+ if test "$linkmode,$pass" = "prog,link"; then |
| 721 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 722 |
+ finalize_deplibs="$deplib $finalize_deplibs" |
| 723 |
+ else |
| 724 |
|
| 725 |
diff --git a/eclass/ELT-patches/as-needed/2.2.6 b/eclass/ELT-patches/as-needed/2.2.6 |
| 726 |
new file mode 100644 |
| 727 |
index 0000000..7e71de4 |
| 728 |
--- /dev/null |
| 729 |
+++ b/eclass/ELT-patches/as-needed/2.2.6 |
| 730 |
@@ -0,0 +1,38 @@ |
| 731 |
+--- ltmain.sh.orig 2009-04-18 14:37:16.000000000 +0200 |
| 732 |
++++ ltmain.sh 2009-04-18 14:40:08.000000000 +0200 |
| 733 |
+@@ -4721,10 +4721,15 @@ |
| 734 |
+ IFS="$save_ifs" |
| 735 |
+ func_stripname ' ' '' "$arg" |
| 736 |
+ arg=$func_stripname_result |
| 737 |
+ ;; |
| 738 |
+ |
| 739 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 740 |
++ deplibs="$deplibs $arg" |
| 741 |
++ continue |
| 742 |
++ ;; |
| 743 |
++ |
| 744 |
+ -Wl,*) |
| 745 |
+ func_stripname '-Wl,' '' "$arg" |
| 746 |
+ args=$func_stripname_result |
| 747 |
+ arg= |
| 748 |
+ save_ifs="$IFS"; IFS=',' |
| 749 |
+@@ -5075,10 +5080,19 @@ |
| 750 |
+ |
| 751 |
+ for deplib in $libs; do |
| 752 |
+ lib= |
| 753 |
+ found=no |
| 754 |
+ case $deplib in |
| 755 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 756 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 757 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 758 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 759 |
++ else |
| 760 |
++ deplibs="$deplib $deplibs" |
| 761 |
++ fi |
| 762 |
++ continue |
| 763 |
++ ;; |
| 764 |
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
| 765 |
+ if test "$linkmode,$pass" = "prog,link"; then |
| 766 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 767 |
+ finalize_deplibs="$deplib $finalize_deplibs" |
| 768 |
+ else |
| 769 |
|
| 770 |
diff --git a/eclass/ELT-patches/as-needed/2.4.2 b/eclass/ELT-patches/as-needed/2.4.2 |
| 771 |
new file mode 100644 |
| 772 |
index 0000000..526877a |
| 773 |
--- /dev/null |
| 774 |
+++ b/eclass/ELT-patches/as-needed/2.4.2 |
| 775 |
@@ -0,0 +1,38 @@ |
| 776 |
+--- ltmain.sh.orig 2012-08-19 10:18:57.929178597 +0200 |
| 777 |
++++ ltmain.sh 2012-08-19 10:31:43.409388998 +0200 |
| 778 |
+@@ -5798,10 +5798,15 @@ |
| 779 |
+ IFS="$save_ifs" |
| 780 |
+ func_stripname ' ' '' "$arg" |
| 781 |
+ arg=$func_stripname_result |
| 782 |
+ ;; |
| 783 |
+ |
| 784 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 785 |
++ deplibs="$deplibs $arg" |
| 786 |
++ continue |
| 787 |
++ ;; |
| 788 |
++ |
| 789 |
+ -Wl,*) |
| 790 |
+ func_stripname '-Wl,' '' "$arg" |
| 791 |
+ args=$func_stripname_result |
| 792 |
+ arg= |
| 793 |
+ save_ifs="$IFS"; IFS=',' |
| 794 |
+@@ -6158,10 +6163,19 @@ |
| 795 |
+ |
| 796 |
+ for deplib in $libs; do |
| 797 |
+ lib= |
| 798 |
+ found=no |
| 799 |
+ case $deplib in |
| 800 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 801 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 802 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 803 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 804 |
++ else |
| 805 |
++ deplibs="$deplib $deplibs" |
| 806 |
++ fi |
| 807 |
++ continue |
| 808 |
++ ;; |
| 809 |
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
| 810 |
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
| 811 |
+ if test "$linkmode,$pass" = "prog,link"; then |
| 812 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 813 |
+ finalize_deplibs="$deplib $finalize_deplibs" |
| 814 |
|
| 815 |
diff --git a/eclass/ELT-patches/as-needed/2.4.3 b/eclass/ELT-patches/as-needed/2.4.3 |
| 816 |
new file mode 100644 |
| 817 |
index 0000000..a31e9ed |
| 818 |
--- /dev/null |
| 819 |
+++ b/eclass/ELT-patches/as-needed/2.4.3 |
| 820 |
@@ -0,0 +1,38 @@ |
| 821 |
+--- ltmain.sh |
| 822 |
++++ ltmain.sh |
| 823 |
+@@ -7225,10 +7225,15 @@ |
| 824 |
+ IFS=$save_ifs |
| 825 |
+ func_stripname ' ' '' "$arg" |
| 826 |
+ arg=$func_stripname_result |
| 827 |
+ ;; |
| 828 |
+ |
| 829 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 830 |
++ deplibs="$deplibs $arg" |
| 831 |
++ continue |
| 832 |
++ ;; |
| 833 |
++ |
| 834 |
+ -Wl,*) |
| 835 |
+ func_stripname '-Wl,' '' "$arg" |
| 836 |
+ args=$func_stripname_result |
| 837 |
+ arg= |
| 838 |
+ save_ifs=$IFS; IFS=, |
| 839 |
+@@ -7609,10 +7614,19 @@ |
| 840 |
+ |
| 841 |
+ for deplib in $libs; do |
| 842 |
+ lib= |
| 843 |
+ found=false |
| 844 |
+ case $deplib in |
| 845 |
++ -Wl,--as-needed|-Wl,--no-as-needed) |
| 846 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 847 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 848 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 849 |
++ else |
| 850 |
++ deplibs="$deplib $deplibs" |
| 851 |
++ fi |
| 852 |
++ continue |
| 853 |
++ ;; |
| 854 |
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
| 855 |
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
| 856 |
+ if test prog,link = "$linkmode,$pass"; then |
| 857 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 858 |
+ finalize_deplibs="$deplib $finalize_deplibs" |
| 859 |
|
| 860 |
diff --git a/eclass/ELT-patches/cross/2.2 b/eclass/ELT-patches/cross/2.2 |
| 861 |
new file mode 100644 |
| 862 |
index 0000000..e8fc2be |
| 863 |
--- /dev/null |
| 864 |
+++ b/eclass/ELT-patches/cross/2.2 |
| 865 |
@@ -0,0 +1,20 @@ |
| 866 |
+--- ltmain.sh |
| 867 |
++++ ltmain.sh |
| 868 |
+@@ -5768,7 +5768,7 @@ |
| 869 |
+ test "$hardcode_direct_absolute" = no; then |
| 870 |
+ add="$libdir/$linklib" |
| 871 |
+ elif test "$hardcode_minus_L" = yes; then |
| 872 |
+- add_dir="-L$libdir" |
| 873 |
++ add_dir="-L${SYSROOT}$libdir" |
| 874 |
+ add="-l$name" |
| 875 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 876 |
+ case :$finalize_shlibpath: in |
| 877 |
+@@ -5785,7 +5785,7 @@ |
| 878 |
+ fi |
| 879 |
+ else |
| 880 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 881 |
+- add_dir="-L$libdir" |
| 882 |
++ add_dir="-L${SYSROOT}/$libdir" |
| 883 |
+ # Try looking first in the location we're being installed to. |
| 884 |
+ if test -n "$inst_prefix_dir"; then |
| 885 |
+ case $libdir in |
| 886 |
|
| 887 |
diff --git a/eclass/ELT-patches/cross/2.4 b/eclass/ELT-patches/cross/2.4 |
| 888 |
new file mode 100644 |
| 889 |
index 0000000..9b35295 |
| 890 |
--- /dev/null |
| 891 |
+++ b/eclass/ELT-patches/cross/2.4 |
| 892 |
@@ -0,0 +1,20 @@ |
| 893 |
+--- ltmain.sh |
| 894 |
++++ ltmain.sh |
| 895 |
+@@ -5768,7 +5768,7 @@ |
| 896 |
+ test "$hardcode_direct_absolute" = no; then |
| 897 |
+ add="$libdir/$linklib" |
| 898 |
+ elif test "$hardcode_minus_L" = yes; then |
| 899 |
+- add_dir="-L$libdir" |
| 900 |
++ add_dir="-L${lt_sysroot:-${SYSROOT}}$libdir" |
| 901 |
+ add="-l$name" |
| 902 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 903 |
+ case :$finalize_shlibpath: in |
| 904 |
+@@ -5785,7 +5785,7 @@ |
| 905 |
+ fi |
| 906 |
+ else |
| 907 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 908 |
+- add_dir="-L$libdir" |
| 909 |
++ add_dir="-L${lt_sysroot:-${SYSROOT}}/$libdir" |
| 910 |
+ # Try looking first in the location we're being installed to. |
| 911 |
+ if test -n "$inst_prefix_dir"; then |
| 912 |
+ case $libdir in |
| 913 |
|
| 914 |
diff --git a/eclass/ELT-patches/cross/2.4.3 b/eclass/ELT-patches/cross/2.4.3 |
| 915 |
new file mode 100644 |
| 916 |
index 0000000..760104f |
| 917 |
--- /dev/null |
| 918 |
+++ b/eclass/ELT-patches/cross/2.4.3 |
| 919 |
@@ -0,0 +1,21 @@ |
| 920 |
+--- ltmain.sh |
| 921 |
++++ ltmain.sh |
| 922 |
+@@ -8367,7 +8367,7 @@ |
| 923 |
+ test no = "$hardcode_direct_absolute"; then |
| 924 |
+ add=$libdir/$linklib |
| 925 |
+ elif test yes = "$hardcode_minus_L"; then |
| 926 |
+- add_dir=-L$libdir |
| 927 |
++ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir |
| 928 |
+ add=-l$name |
| 929 |
+ elif test yes = "$hardcode_shlibpath_var"; then |
| 930 |
+ case :$finalize_shlibpath: in |
| 931 |
+@@ -8384,7 +8384,7 @@ |
| 932 |
+ fi |
| 933 |
+ else |
| 934 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 935 |
+- add_dir=-L$libdir |
| 936 |
++ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir |
| 937 |
+ # Try looking first in the location we're being installed to. |
| 938 |
+ if test -n "$inst_prefix_dir"; then |
| 939 |
+ case $libdir in |
| 940 |
+ |
| 941 |
|
| 942 |
diff --git a/eclass/ELT-patches/darwin-conf/1.5 b/eclass/ELT-patches/darwin-conf/1.5 |
| 943 |
new file mode 100644 |
| 944 |
index 0000000..46d9e5a |
| 945 |
--- /dev/null |
| 946 |
+++ b/eclass/ELT-patches/darwin-conf/1.5 |
| 947 |
@@ -0,0 +1,24 @@ |
| 948 |
+In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
| 949 |
+extension. |
| 950 |
+http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
| 951 |
+(Above link was removed by Apple, the link below contains a copy: |
| 952 |
+http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
| 953 |
+in case it disappears also, the relevant quote: |
| 954 |
+ |
| 955 |
+Bundle. Bundles are executable files that can be loaded at runtime by |
| 956 |
+other products. Plug-ins are implemented using bundles. The term bundle |
| 957 |
+in this context refers to the binary itself, not to a structured |
| 958 |
+hierarchy. Bundles have the .bundle extension; for example, |
| 959 |
+MyBundle.bundle.) |
| 960 |
+ |
| 961 |
+--- configure.orig 2009-05-22 12:05:31 +0200 |
| 962 |
++++ configure 2009-05-22 12:05:39 +0200 |
| 963 |
+@@ -15461,7 +15461,7 @@ |
| 964 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
| 965 |
+ shlibpath_overrides_runpath=yes |
| 966 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 967 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 968 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 969 |
+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
| 970 |
+ if test "$GCC" = yes; then |
| 971 |
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
| 972 |
|
| 973 |
diff --git a/eclass/ELT-patches/darwin-conf/1.5b b/eclass/ELT-patches/darwin-conf/1.5b |
| 974 |
new file mode 100644 |
| 975 |
index 0000000..65633a8 |
| 976 |
--- /dev/null |
| 977 |
+++ b/eclass/ELT-patches/darwin-conf/1.5b |
| 978 |
@@ -0,0 +1,33 @@ |
| 979 |
+In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
| 980 |
+extension. |
| 981 |
+http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
| 982 |
+(Above link was removed by Apple, the link below contains a copy: |
| 983 |
+http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
| 984 |
+in case it disappears also, the relevant quote: |
| 985 |
+ |
| 986 |
+Bundle. Bundles are executable files that can be loaded at runtime by |
| 987 |
+other products. Plug-ins are implemented using bundles. The term bundle |
| 988 |
+in this context refers to the binary itself, not to a structured |
| 989 |
+hierarchy. Bundles have the .bundle extension; for example, |
| 990 |
+MyBundle.bundle.) |
| 991 |
+ |
| 992 |
+--- configure |
| 993 |
++++ configure |
| 994 |
+@@ -10570,7 +10570,7 @@ |
| 995 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
| 996 |
+ shlibpath_overrides_runpath=yes |
| 997 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 998 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 999 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 1000 |
+ |
| 1001 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
| 1002 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 1003 |
+@@ -14213,7 +14213,7 @@ |
| 1004 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
| 1005 |
+ shlibpath_overrides_runpath=yes |
| 1006 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 1007 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 1008 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 1009 |
+ |
| 1010 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 1011 |
+ ;; |
| 1012 |
|
| 1013 |
diff --git a/eclass/ELT-patches/darwin-conf/2.2.4 b/eclass/ELT-patches/darwin-conf/2.2.4 |
| 1014 |
new file mode 100644 |
| 1015 |
index 0000000..5ad8293 |
| 1016 |
--- /dev/null |
| 1017 |
+++ b/eclass/ELT-patches/darwin-conf/2.2.4 |
| 1018 |
@@ -0,0 +1,29 @@ |
| 1019 |
+In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
| 1020 |
+extension. |
| 1021 |
+http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
| 1022 |
+(Above link was removed by Apple, the link below contains a copy: |
| 1023 |
+http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
| 1024 |
+in case it disappears also, the relevant quote: |
| 1025 |
+ |
| 1026 |
+Bundle. Bundles are executable files that can be loaded at runtime by |
| 1027 |
+other products. Plug-ins are implemented using bundles. The term bundle |
| 1028 |
+in this context refers to the binary itself, not to a structured |
| 1029 |
+hierarchy. Bundles have the .bundle extension; for example, |
| 1030 |
+MyBundle.bundle.) |
| 1031 |
+ |
| 1032 |
+--- configure |
| 1033 |
++++ configure |
| 1034 |
+@@ -12172,11 +12172,11 @@ |
| 1035 |
+ version_type=darwin |
| 1036 |
+ need_lib_prefix=no |
| 1037 |
+ need_version=no |
| 1038 |
+- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
| 1039 |
++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
| 1040 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
| 1041 |
+ shlibpath_overrides_runpath=yes |
| 1042 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 1043 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 1044 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 1045 |
+ |
| 1046 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
| 1047 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 1048 |
|
| 1049 |
diff --git a/eclass/ELT-patches/darwin-conf/2.2.6 b/eclass/ELT-patches/darwin-conf/2.2.6 |
| 1050 |
new file mode 100644 |
| 1051 |
index 0000000..669a68d |
| 1052 |
--- /dev/null |
| 1053 |
+++ b/eclass/ELT-patches/darwin-conf/2.2.6 |
| 1054 |
@@ -0,0 +1,43 @@ |
| 1055 |
+In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
| 1056 |
+extension. |
| 1057 |
+http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
| 1058 |
+(Above link was removed by Apple, the link below contains a copy: |
| 1059 |
+http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
| 1060 |
+in case it disappears also, the relevant quote: |
| 1061 |
+ |
| 1062 |
+Bundle. Bundles are executable files that can be loaded at runtime by |
| 1063 |
+other products. Plug-ins are implemented using bundles. The term bundle |
| 1064 |
+in this context refers to the binary itself, not to a structured |
| 1065 |
+hierarchy. Bundles have the .bundle extension; for example, |
| 1066 |
+MyBundle.bundle.) |
| 1067 |
+ |
| 1068 |
+--- configure |
| 1069 |
++++ configure |
| 1070 |
+@@ -11455,11 +11455,11 @@ |
| 1071 |
+ version_type=darwin |
| 1072 |
+ need_lib_prefix=no |
| 1073 |
+ need_version=no |
| 1074 |
+- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
| 1075 |
++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
| 1076 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
| 1077 |
+ shlibpath_overrides_runpath=yes |
| 1078 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 1079 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 1080 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 1081 |
+ |
| 1082 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
| 1083 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 1084 |
+@@ -15321,11 +15331,11 @@ |
| 1085 |
+ version_type=darwin |
| 1086 |
+ need_lib_prefix=no |
| 1087 |
+ need_version=no |
| 1088 |
+- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
| 1089 |
++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
| 1090 |
+ soname_spec='${libname}${release}${major}$shared_ext' |
| 1091 |
+ shlibpath_overrides_runpath=yes |
| 1092 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 1093 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 1094 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 1095 |
+ |
| 1096 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 1097 |
+ ;; |
| 1098 |
|
| 1099 |
diff --git a/eclass/ELT-patches/darwin-conf/2.4.6 b/eclass/ELT-patches/darwin-conf/2.4.6 |
| 1100 |
new file mode 100644 |
| 1101 |
index 0000000..a67ba12 |
| 1102 |
--- /dev/null |
| 1103 |
+++ b/eclass/ELT-patches/darwin-conf/2.4.6 |
| 1104 |
@@ -0,0 +1,29 @@ |
| 1105 |
+In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
| 1106 |
+extension. |
| 1107 |
+http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
| 1108 |
+(Above link was removed by Apple, the link below contains a copy: |
| 1109 |
+http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
| 1110 |
+in case it disappears also, the relevant quote: |
| 1111 |
+ |
| 1112 |
+Bundle. Bundles are executable files that can be loaded at runtime by |
| 1113 |
+other products. Plug-ins are implemented using bundles. The term bundle |
| 1114 |
+in this context refers to the binary itself, not to a structured |
| 1115 |
+hierarchy. Bundles have the .bundle extension; for example, |
| 1116 |
+MyBundle.bundle.) |
| 1117 |
+ |
| 1118 |
+--- configure |
| 1119 |
++++ configure |
| 1120 |
+@@ -13108,11 +13108,11 @@ |
| 1121 |
+ version_type=darwin |
| 1122 |
+ need_lib_prefix=no |
| 1123 |
+ need_version=no |
| 1124 |
+- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' |
| 1125 |
++ library_names_spec='${libname}${release}${versuffix}$shared_ext $libname$release$major$shared_ext $libname$shared_ext' |
| 1126 |
+ soname_spec='$libname$release$major$shared_ext' |
| 1127 |
+ shlibpath_overrides_runpath=yes |
| 1128 |
+ shlibpath_var=DYLD_LIBRARY_PATH |
| 1129 |
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
| 1130 |
++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
| 1131 |
+ |
| 1132 |
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
| 1133 |
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 1134 |
|
| 1135 |
diff --git a/eclass/ELT-patches/darwin-ltconf/1.2.0 b/eclass/ELT-patches/darwin-ltconf/1.2.0 |
| 1136 |
new file mode 100644 |
| 1137 |
index 0000000..da9f7e4 |
| 1138 |
--- /dev/null |
| 1139 |
+++ b/eclass/ELT-patches/darwin-ltconf/1.2.0 |
| 1140 |
@@ -0,0 +1,66 @@ |
| 1141 |
+--- ltconfig-1.2 Wed May 19 09:17:36 1999 |
| 1142 |
++++ ltconfig Wed Oct 6 14:29:08 2004 |
| 1143 |
+@@ -459,6 +459,11 @@ |
| 1144 |
+ os2*) |
| 1145 |
+ # We can build DLLs from non-PIC. |
| 1146 |
+ ;; |
| 1147 |
++ darwin* | rhapsody*) |
| 1148 |
++ # PIC is the default on this platform |
| 1149 |
++ # Common symbols not allowed in MH_DYLIB files |
| 1150 |
++ pic_flag='-fno-common' |
| 1151 |
++ ;; |
| 1152 |
+ amigaos*) |
| 1153 |
+ # FIXME: we need at least 68020 code to build shared libraries, but |
| 1154 |
+ # adding the `-m68020' flag to GCC prevents building anything better, |
| 1155 |
+@@ -785,6 +790,23 @@ |
| 1156 |
+ hardcode_shlibpath_var=no |
| 1157 |
+ ;; |
| 1158 |
+ |
| 1159 |
++ darwin* | rhapsody*) |
| 1160 |
++ case "$host_os" in |
| 1161 |
++ rhapsody* | darwin1.[012]) |
| 1162 |
++ allow_undefined_flag='-undefined suppress' |
| 1163 |
++ ;; |
| 1164 |
++ *) # Darwin 1.3 on |
| 1165 |
++ allow_undefined_flag='-flat_namespace -undefined suppress' |
| 1166 |
++ ;; |
| 1167 |
++ esac |
| 1168 |
++ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' |
| 1169 |
++ # We need to add '_' to the symbols in $export_symbols first |
| 1170 |
++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' |
| 1171 |
++ hardcode_direct=yes |
| 1172 |
++ hardcode_shlibpath_var=no |
| 1173 |
++ whole_archive_flag_spec='-all_load $convenience' |
| 1174 |
++ ;; |
| 1175 |
++ |
| 1176 |
+ hpux9*) |
| 1177 |
+ archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib' |
| 1178 |
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
| 1179 |
+@@ -1134,6 +1156,27 @@ |
| 1180 |
+ version_type=sunos |
| 1181 |
+ library_names_spec='${libname}${release}.so.$versuffix' |
| 1182 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1183 |
++ ;; |
| 1184 |
++ |
| 1185 |
++darwin* | rhapsody*) |
| 1186 |
++ dynamic_linker="$host_os dyld" |
| 1187 |
++ version_type=darwin |
| 1188 |
++ need_lib_prefix=no |
| 1189 |
++ need_version=no |
| 1190 |
++ deplibs_check_method='file_magic Mach-O dynamically linked shared library' |
| 1191 |
++ file_magic_cmd='/usr/bin/file -L' |
| 1192 |
++ case "$host_os" in |
| 1193 |
++ rhapsody* | darwin1.[012]) |
| 1194 |
++ file_magic_test_file='/System/Library/Frameworks/System.framework/System' |
| 1195 |
++ ;; |
| 1196 |
++ *) # Darwin 1.3 on |
| 1197 |
++ file_magic_test_file='/usr/lib/libSystem.dylib' |
| 1198 |
++ ;; |
| 1199 |
++ esac |
| 1200 |
++ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' |
| 1201 |
++ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' |
| 1202 |
++ shlibpath_overrides_runpath=yes |
| 1203 |
++ shlibpath_var=DYLD_LIBRARY_PATH |
| 1204 |
+ ;; |
| 1205 |
+ |
| 1206 |
+ hpux9* | hpux10*) |
| 1207 |
|
| 1208 |
diff --git a/eclass/ELT-patches/darwin-ltconf/1.3.0 b/eclass/ELT-patches/darwin-ltconf/1.3.0 |
| 1209 |
new file mode 100644 |
| 1210 |
index 0000000..49ae67d |
| 1211 |
--- /dev/null |
| 1212 |
+++ b/eclass/ELT-patches/darwin-ltconf/1.3.0 |
| 1213 |
@@ -0,0 +1,67 @@ |
| 1214 |
+--- ltconfig.darwin 2000-02-02 19:53:22.000000000 -0500 |
| 1215 |
++++ ltconfig 2004-09-23 20:25:11.000000000 -0400 |
| 1216 |
+@@ -678,6 +678,11 @@ |
| 1217 |
+ cygwin* | mingw* | os2*) |
| 1218 |
+ # We can build DLLs from non-PIC. |
| 1219 |
+ ;; |
| 1220 |
++ darwin* | rhapsody*) |
| 1221 |
++ # PIC is the default on this platform |
| 1222 |
++ # Common symbols not allowed in MH_DYLIB files |
| 1223 |
++ pic_flag='-fno-common' |
| 1224 |
++ ;; |
| 1225 |
+ amigaos*) |
| 1226 |
+ # FIXME: we need at least 68020 code to build shared libraries, but |
| 1227 |
+ # adding the `-m68020' flag to GCC prevents building anything better, |
| 1228 |
+@@ -1361,6 +1372,23 @@ |
| 1229 |
+ hardcode_shlibpath_var=no |
| 1230 |
+ ;; |
| 1231 |
+ |
| 1232 |
++ darwin* | rhapsody*) |
| 1233 |
++ case "$host_os" in |
| 1234 |
++ rhapsody* | darwin1.[012]) |
| 1235 |
++ allow_undefined_flag='-undefined suppress' |
| 1236 |
++ ;; |
| 1237 |
++ *) # Darwin 1.3 on |
| 1238 |
++ allow_undefined_flag='-flat_namespace -undefined suppress' |
| 1239 |
++ ;; |
| 1240 |
++ esac |
| 1241 |
++ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' |
| 1242 |
++ # We need to add '_' to the symbols in $export_symbols first |
| 1243 |
++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' |
| 1244 |
++ hardcode_direct=yes |
| 1245 |
++ hardcode_shlibpath_var=no |
| 1246 |
++ whole_archive_flag_spec='-all_load $convenience' |
| 1247 |
++ ;; |
| 1248 |
++ |
| 1249 |
+ hpux9* | hpux10* | hpux11*) |
| 1250 |
+ case "$host_os" in |
| 1251 |
+ hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; |
| 1252 |
+@@ -1897,6 +1931,27 @@ |
| 1253 |
+ esac |
| 1254 |
+ ;; |
| 1255 |
+ |
| 1256 |
++darwin* | rhapsody*) |
| 1257 |
++ dynamic_linker="$host_os dyld" |
| 1258 |
++ version_type=darwin |
| 1259 |
++ need_lib_prefix=no |
| 1260 |
++ need_version=no |
| 1261 |
++ deplibs_check_method='file_magic Mach-O dynamically linked shared library' |
| 1262 |
++ file_magic_cmd='/usr/bin/file -L' |
| 1263 |
++ case "$host_os" in |
| 1264 |
++ rhapsody* | darwin1.[012]) |
| 1265 |
++ file_magic_test_file='/System/Library/Frameworks/System.framework/System' |
| 1266 |
++ ;; |
| 1267 |
++ *) # Darwin 1.3 on |
| 1268 |
++ file_magic_test_file='/usr/lib/libSystem.dylib' |
| 1269 |
++ ;; |
| 1270 |
++ esac |
| 1271 |
++ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' |
| 1272 |
++ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' |
| 1273 |
++ shlibpath_overrides_runpath=yes |
| 1274 |
++ shlibpath_var=DYLD_LIBRARY_PATH |
| 1275 |
++ ;; |
| 1276 |
++ |
| 1277 |
+ gnu*) |
| 1278 |
+ version_type=linux |
| 1279 |
+ need_lib_prefix=no |
| 1280 |
+ |
| 1281 |
|
| 1282 |
diff --git a/eclass/ELT-patches/darwin-ltmain/1.2.0 b/eclass/ELT-patches/darwin-ltmain/1.2.0 |
| 1283 |
new file mode 100644 |
| 1284 |
index 0000000..aaab86a |
| 1285 |
--- /dev/null |
| 1286 |
+++ b/eclass/ELT-patches/darwin-ltmain/1.2.0 |
| 1287 |
@@ -0,0 +1,40 @@ |
| 1288 |
+--- ltmain.sh-1.2 Wed May 19 09:17:36 1999 |
| 1289 |
++++ ltmain.sh Wed Oct 6 14:38:37 2004 |
| 1290 |
+@@ -967,6 +967,16 @@ |
| 1291 |
+ versuffix="$current.$revision" |
| 1292 |
+ ;; |
| 1293 |
+ |
| 1294 |
++ darwin) |
| 1295 |
++ # Like Linux, but with the current version available in |
| 1296 |
++ # verstring for coding it into the library header |
| 1297 |
++ major=.`expr $current - $age` |
| 1298 |
++ versuffix="$major.$age.$revision" |
| 1299 |
++ # Darwin ld doesn't like 0 for these options... |
| 1300 |
++ minor_current=`expr $current + 1` |
| 1301 |
++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" |
| 1302 |
++ ;; |
| 1303 |
++ |
| 1304 |
+ *) |
| 1305 |
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2 |
| 1306 |
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
| 1307 |
+@@ -1000,9 +1010,17 @@ |
| 1308 |
+ allow_undefined_flag="$no_undefined_flag" |
| 1309 |
+ fi |
| 1310 |
+ |
| 1311 |
+- # Add libc to deplibs on all systems. |
| 1312 |
+- dependency_libs="$deplibs" |
| 1313 |
+- deplibs="$deplibs -lc" |
| 1314 |
++ case "$version_type" in |
| 1315 |
++ rhapsody|darwin) |
| 1316 |
++ # Rhapsody C library is in the System framework |
| 1317 |
++ deplibs="$deplibs -framework System" |
| 1318 |
++ ;; |
| 1319 |
++ *) |
| 1320 |
++ # Add libc to deplibs on all other systems. |
| 1321 |
++ dependency_libs="$deplibs" |
| 1322 |
++ deplibs="$deplibs -lc" |
| 1323 |
++ ;; |
| 1324 |
++ esac |
| 1325 |
+ |
| 1326 |
+ if test "$build_libtool_libs" = yes; then |
| 1327 |
+ # Get the real and link names of the library. |
| 1328 |
|
| 1329 |
diff --git a/eclass/ELT-patches/darwin-ltmain/1.3.0 b/eclass/ELT-patches/darwin-ltmain/1.3.0 |
| 1330 |
new file mode 100644 |
| 1331 |
index 0000000..7148efb |
| 1332 |
--- /dev/null |
| 1333 |
+++ b/eclass/ELT-patches/darwin-ltmain/1.3.0 |
| 1334 |
@@ -0,0 +1,64 @@ |
| 1335 |
+--- ltmain.sh.darwin 2000-02-02 19:53:22.000000000 -0500 |
| 1336 |
++++ ltmain.sh 2004-09-23 20:25:11.000000000 -0400 |
| 1337 |
+@@ -24,6 +24,8 @@ |
| 1338 |
+ # configuration script generated by Autoconf, you may include it under |
| 1339 |
+ # the same distribution terms that you use for the rest of that program. |
| 1340 |
+ |
| 1341 |
++_S_=${LIBTOOL_CMD_SEP-\~} |
| 1342 |
++ |
| 1343 |
+ # Check that we have a working $echo. |
| 1344 |
+ if test "X$1" = X--no-reexec; then |
| 1345 |
+ # Discard the --no-reexec flag, and continue. |
| 1346 |
+@@ -1079,6 +1079,11 @@ |
| 1347 |
+ # These systems don't actually have c library (as such) |
| 1348 |
+ continue |
| 1349 |
+ ;; |
| 1350 |
++ *-*-rhapsody* | *-*-darwin1.[012]) |
| 1351 |
++ # Rhapsody C library is in the System framework |
| 1352 |
++ deplibs="$deplibs -framework System" |
| 1353 |
++ continue |
| 1354 |
++ ;; |
| 1355 |
+ esac |
| 1356 |
+ elif test "$arg" = "-lm"; then |
| 1357 |
+ case "$host" in |
| 1358 |
+@@ -1086,6 +1091,11 @@ |
| 1359 |
+ # These systems don't actually have math library (as such) |
| 1360 |
+ continue |
| 1361 |
+ ;; |
| 1362 |
++ *-*-rhapsody* | *-*-darwin1.[012]) |
| 1363 |
++ # Rhapsody math library is in the System framework |
| 1364 |
++ deplibs="$deplibs -framework System" |
| 1365 |
++ continue |
| 1366 |
++ ;; |
| 1367 |
+ esac |
| 1368 |
+ fi |
| 1369 |
+ deplibs="$deplibs $arg" |
| 1370 |
+@@ -1753,6 +1763,16 @@ |
| 1371 |
+ versuffix="-$major-$age-$revision" |
| 1372 |
+ ;; |
| 1373 |
+ |
| 1374 |
++ darwin) |
| 1375 |
++ # Like Linux, but with the current version available in |
| 1376 |
++ # verstring for coding it into the library header |
| 1377 |
++ major=.`expr $current - $age` |
| 1378 |
++ versuffix="$major.$age.$revision" |
| 1379 |
++ # Darwin ld doesn't like 0 for these options... |
| 1380 |
++ minor_current=`expr $current + 1` |
| 1381 |
++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" |
| 1382 |
++ ;; |
| 1383 |
++ |
| 1384 |
+ *) |
| 1385 |
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2 |
| 1386 |
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
| 1387 |
+@@ -1795,6 +1824,10 @@ |
| 1388 |
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) |
| 1389 |
+ # these systems don't actually have a c library (as such)! |
| 1390 |
+ ;; |
| 1391 |
++ *-*-rhapsody* | *-*-darwin1.[012]) |
| 1392 |
++ # Rhapsody C library is in the System framework |
| 1393 |
++ deplibs="$deplibs -framework System" |
| 1394 |
++ ;; |
| 1395 |
+ *) |
| 1396 |
+ # Add libc to deplibs on all other systems. |
| 1397 |
+ deplibs="$deplibs -lc" |
| 1398 |
+ |
| 1399 |
|
| 1400 |
diff --git a/eclass/ELT-patches/deplibs/1.5 b/eclass/ELT-patches/deplibs/1.5 |
| 1401 |
new file mode 100644 |
| 1402 |
index 0000000..36c507a |
| 1403 |
--- /dev/null |
| 1404 |
+++ b/eclass/ELT-patches/deplibs/1.5 |
| 1405 |
@@ -0,0 +1,18 @@ |
| 1406 |
+--- libtool.orig 2009-07-15 16:25:32 +0200 |
| 1407 |
++++ libtool 2009-07-15 16:51:56 +0200 |
| 1408 |
+@@ -3319,7 +3319,14 @@ |
| 1409 |
+ ;; |
| 1410 |
+ esac |
| 1411 |
+ if grep "^installed=no" $deplib > /dev/null; then |
| 1412 |
+- path="$absdir/$objdir" |
| 1413 |
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 1414 |
++ eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 1415 |
++ for library_name in ${library_names}; do :; done |
| 1416 |
++ if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then |
| 1417 |
++ path="${inst_prefix_dir}${libdir}" |
| 1418 |
++ else |
| 1419 |
++ path="$absdir/$objdir" |
| 1420 |
++ fi |
| 1421 |
+ else |
| 1422 |
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 1423 |
+ if test -z "$libdir"; then |
| 1424 |
|
| 1425 |
diff --git a/eclass/ELT-patches/deplibs/2.1b b/eclass/ELT-patches/deplibs/2.1b |
| 1426 |
new file mode 100644 |
| 1427 |
index 0000000..3df590d |
| 1428 |
--- /dev/null |
| 1429 |
+++ b/eclass/ELT-patches/deplibs/2.1b |
| 1430 |
@@ -0,0 +1,18 @@ |
| 1431 |
+--- ltmain-release-2-1b.in 2009-06-22 15:33:26.000000000 +0200 |
| 1432 |
++++ ltmain-release-2-1b.in.new 2009-07-15 16:59:45.000000000 +0200 |
| 1433 |
+@@ -4946,7 +4946,14 @@ |
| 1434 |
+ fi |
| 1435 |
+ ;; |
| 1436 |
+ *) |
| 1437 |
+- path="-L$absdir/$objdir" |
| 1438 |
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 1439 |
++ eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 1440 |
++ for library_name in ${library_names}; do :; done |
| 1441 |
++ if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then |
| 1442 |
++ path="-L${inst_prefix_dir}${libdir}" |
| 1443 |
++ else |
| 1444 |
++ path="-L$absdir/$objdir" |
| 1445 |
++ fi |
| 1446 |
+ ;; |
| 1447 |
+ esac |
| 1448 |
+ else |
| 1449 |
|
| 1450 |
diff --git a/eclass/ELT-patches/fbsd-conf/00broken-libglade b/eclass/ELT-patches/fbsd-conf/00broken-libglade |
| 1451 |
new file mode 100644 |
| 1452 |
index 0000000..df3c438 |
| 1453 |
--- /dev/null |
| 1454 |
+++ b/eclass/ELT-patches/fbsd-conf/00broken-libglade |
| 1455 |
@@ -0,0 +1,33 @@ |
| 1456 |
+Index: tiff-3.8.2/configure |
| 1457 |
+=================================================================== |
| 1458 |
+--- tiff-3.8.2.orig/configure |
| 1459 |
++++ tiff-3.8.2/configure |
| 1460 |
+@@ -8199,7 +8199,14 @@ freebsd* | dragonfly*) |
| 1461 |
+ *) objformat=elf ;; |
| 1462 |
+ esac |
| 1463 |
+ fi |
| 1464 |
+- version_type=freebsd-$objformat |
| 1465 |
++ # Handle Gentoo/FreeBSD as it was Linux |
| 1466 |
++ case $host_vendor in |
| 1467 |
++ gentoo) |
| 1468 |
++ version_type=linux ;; |
| 1469 |
++ *) |
| 1470 |
++ version_type=freebsd-$objformat ;; |
| 1471 |
++ esac |
| 1472 |
++ |
| 1473 |
+ case $version_type in |
| 1474 |
+ freebsd-elf*) |
| 1475 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1476 |
+@@ -8210,6 +8216,12 @@ freebsd* | dragonfly*) |
| 1477 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1478 |
+ need_version=yes |
| 1479 |
+ ;; |
| 1480 |
++ linux) |
| 1481 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1482 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1483 |
++ need_lib_prefix=no |
| 1484 |
++ need_version=no |
| 1485 |
++ ;; |
| 1486 |
+ esac |
| 1487 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1488 |
+ case $host_os in |
| 1489 |
\ No newline at end of file |
| 1490 |
|
| 1491 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.4.0 b/eclass/ELT-patches/fbsd-conf/1.4.0 |
| 1492 |
new file mode 100644 |
| 1493 |
index 0000000..b986f8d |
| 1494 |
--- /dev/null |
| 1495 |
+++ b/eclass/ELT-patches/fbsd-conf/1.4.0 |
| 1496 |
@@ -0,0 +1,32 @@ |
| 1497 |
+Index: expat-1.95.8/configure |
| 1498 |
+=================================================================== |
| 1499 |
+--- expat-1.95.8.orig/configure |
| 1500 |
++++ expat-1.95.8/configure |
| 1501 |
+@@ -5479,7 +5479,13 @@ freebsd1*) |
| 1502 |
+ |
| 1503 |
+ freebsd*) |
| 1504 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1505 |
+- version_type=freebsd-$objformat |
| 1506 |
++ case $host_vendor in |
| 1507 |
++ gentoo) |
| 1508 |
++ version_type=linux ;; |
| 1509 |
++ *) |
| 1510 |
++ version_type=freebsd-$objformat ;; |
| 1511 |
++ esac |
| 1512 |
++ |
| 1513 |
+ case $version_type in |
| 1514 |
+ freebsd-elf*) |
| 1515 |
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' |
| 1516 |
+@@ -5490,6 +5496,12 @@ freebsd*) |
| 1517 |
+ library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
| 1518 |
+ need_version=yes |
| 1519 |
+ ;; |
| 1520 |
++ linux) |
| 1521 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
| 1522 |
++ soname_spec='${libname}${release}.so$major' |
| 1523 |
++ need_lib_prefix=no |
| 1524 |
++ need_version=no |
| 1525 |
++ ;; |
| 1526 |
+ esac |
| 1527 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1528 |
+ case $host_os in |
| 1529 |
|
| 1530 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.10 b/eclass/ELT-patches/fbsd-conf/1.5.10 |
| 1531 |
new file mode 100644 |
| 1532 |
index 0000000..90c6347 |
| 1533 |
--- /dev/null |
| 1534 |
+++ b/eclass/ELT-patches/fbsd-conf/1.5.10 |
| 1535 |
@@ -0,0 +1,120 @@ |
| 1536 |
+Index: libiconv-1.10/configure |
| 1537 |
+=================================================================== |
| 1538 |
+--- libiconv-1.10.orig/configure |
| 1539 |
++++ libiconv-1.10/configure |
| 1540 |
+@@ -8902,7 +8902,14 @@ kfreebsd*-gnu) |
| 1541 |
+ |
| 1542 |
+ freebsd*) |
| 1543 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1544 |
+- version_type=freebsd-$objformat |
| 1545 |
++ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
| 1546 |
++ case $host_vendor in |
| 1547 |
++ gentoo) |
| 1548 |
++ version_type=linux ;; |
| 1549 |
++ *) |
| 1550 |
++ version_type=freebsd-$objformat ;; |
| 1551 |
++ esac |
| 1552 |
++ |
| 1553 |
+ case $version_type in |
| 1554 |
+ freebsd-elf*) |
| 1555 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1556 |
+@@ -8913,6 +8920,12 @@ freebsd*) |
| 1557 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1558 |
+ need_version=yes |
| 1559 |
+ ;; |
| 1560 |
++ linux) |
| 1561 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1562 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1563 |
++ need_lib_prefix=no |
| 1564 |
++ need_version=no |
| 1565 |
++ ;; |
| 1566 |
+ esac |
| 1567 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1568 |
+ case $host_os in |
| 1569 |
+@@ -12620,7 +12633,14 @@ kfreebsd*-gnu) |
| 1570 |
+ |
| 1571 |
+ freebsd*) |
| 1572 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1573 |
+- version_type=freebsd-$objformat |
| 1574 |
++ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
| 1575 |
++ case $host_vendor in |
| 1576 |
++ gentoo) |
| 1577 |
++ version_type=linux ;; |
| 1578 |
++ *) |
| 1579 |
++ version_type=freebsd-$objformat ;; |
| 1580 |
++ esac |
| 1581 |
++ |
| 1582 |
+ case $version_type in |
| 1583 |
+ freebsd-elf*) |
| 1584 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1585 |
+@@ -12631,6 +12651,12 @@ freebsd*) |
| 1586 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1587 |
+ need_version=yes |
| 1588 |
+ ;; |
| 1589 |
++ linux) |
| 1590 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1591 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1592 |
++ need_lib_prefix=no |
| 1593 |
++ need_version=no |
| 1594 |
++ ;; |
| 1595 |
+ esac |
| 1596 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1597 |
+ case $host_os in |
| 1598 |
+@@ -15784,7 +15810,14 @@ kfreebsd*-gnu) |
| 1599 |
+ |
| 1600 |
+ freebsd*) |
| 1601 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1602 |
+- version_type=freebsd-$objformat |
| 1603 |
++ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
| 1604 |
++ case $host_vendor in |
| 1605 |
++ gentoo) |
| 1606 |
++ version_type=linux ;; |
| 1607 |
++ *) |
| 1608 |
++ version_type=freebsd-$objformat ;; |
| 1609 |
++ esac |
| 1610 |
++ |
| 1611 |
+ case $version_type in |
| 1612 |
+ freebsd-elf*) |
| 1613 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1614 |
+@@ -15795,6 +15828,12 @@ freebsd*) |
| 1615 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1616 |
+ need_version=yes |
| 1617 |
+ ;; |
| 1618 |
++ linux) |
| 1619 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1620 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1621 |
++ need_lib_prefix=no |
| 1622 |
++ need_version=no |
| 1623 |
++ ;; |
| 1624 |
+ esac |
| 1625 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1626 |
+ case $host_os in |
| 1627 |
+@@ -18150,7 +18189,14 @@ kfreebsd*-gnu) |
| 1628 |
+ |
| 1629 |
+ freebsd*) |
| 1630 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1631 |
+- version_type=freebsd-$objformat |
| 1632 |
++ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
| 1633 |
++ case $host_vendor in |
| 1634 |
++ gentoo) |
| 1635 |
++ version_type=linux ;; |
| 1636 |
++ *) |
| 1637 |
++ version_type=freebsd-$objformat ;; |
| 1638 |
++ esac |
| 1639 |
++ |
| 1640 |
+ case $version_type in |
| 1641 |
+ freebsd-elf*) |
| 1642 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1643 |
+@@ -18161,6 +18207,12 @@ freebsd*) |
| 1644 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1645 |
+ need_version=yes |
| 1646 |
+ ;; |
| 1647 |
++ linux) |
| 1648 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1649 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1650 |
++ need_lib_prefix=no |
| 1651 |
++ need_version=no |
| 1652 |
++ ;; |
| 1653 |
+ esac |
| 1654 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1655 |
+ case $host_os in |
| 1656 |
|
| 1657 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.18 b/eclass/ELT-patches/fbsd-conf/1.5.18 |
| 1658 |
new file mode 100644 |
| 1659 |
index 0000000..0636ceb |
| 1660 |
--- /dev/null |
| 1661 |
+++ b/eclass/ELT-patches/fbsd-conf/1.5.18 |
| 1662 |
@@ -0,0 +1,116 @@ |
| 1663 |
+Index: libtool-1.5.18/configure |
| 1664 |
+=================================================================== |
| 1665 |
+--- libtool-1.5.18.orig/configure |
| 1666 |
++++ libtool-1.5.18/configure |
| 1667 |
+@@ -8433,7 +8433,13 @@ freebsd* | dragonfly*) |
| 1668 |
+ # DragonFly does not have aout. When/if they implement a new |
| 1669 |
+ # versioning mechanism, adjust this. |
| 1670 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1671 |
+- version_type=freebsd-$objformat |
| 1672 |
++ case $host_vendor in |
| 1673 |
++ gentoo) |
| 1674 |
++ version_type=linux ;; |
| 1675 |
++ *) |
| 1676 |
++ version_type=freebsd-$objformat ;; |
| 1677 |
++ esac |
| 1678 |
++ |
| 1679 |
+ case $version_type in |
| 1680 |
+ freebsd-elf*) |
| 1681 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1682 |
+@@ -8444,6 +8450,12 @@ freebsd* | dragonfly*) |
| 1683 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1684 |
+ need_version=yes |
| 1685 |
+ ;; |
| 1686 |
++ linux) |
| 1687 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1688 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1689 |
++ need_lib_prefix=no |
| 1690 |
++ need_version=no |
| 1691 |
++ ;; |
| 1692 |
+ esac |
| 1693 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1694 |
+ case $host_os in |
| 1695 |
+@@ -12205,7 +12217,13 @@ freebsd* | dragonfly*) |
| 1696 |
+ # DragonFly does not have aout. When/if they implement a new |
| 1697 |
+ # versioning mechanism, adjust this. |
| 1698 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1699 |
+- version_type=freebsd-$objformat |
| 1700 |
++ case $host_vendor in |
| 1701 |
++ gentoo) |
| 1702 |
++ version_type=linux ;; |
| 1703 |
++ *) |
| 1704 |
++ version_type=freebsd-$objformat ;; |
| 1705 |
++ esac |
| 1706 |
++ |
| 1707 |
+ case $version_type in |
| 1708 |
+ freebsd-elf*) |
| 1709 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1710 |
+@@ -12216,6 +12234,12 @@ freebsd* | dragonfly*) |
| 1711 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1712 |
+ need_version=yes |
| 1713 |
+ ;; |
| 1714 |
++ linux) |
| 1715 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1716 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1717 |
++ need_lib_prefix=no |
| 1718 |
++ need_version=no |
| 1719 |
++ ;; |
| 1720 |
+ esac |
| 1721 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1722 |
+ case $host_os in |
| 1723 |
+@@ -15461,7 +15485,13 @@ freebsd* | dragonfly*) |
| 1724 |
+ # DragonFly does not have aout. When/if they implement a new |
| 1725 |
+ # versioning mechanism, adjust this. |
| 1726 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1727 |
+- version_type=freebsd-$objformat |
| 1728 |
++ case $host_vendor in |
| 1729 |
++ gentoo) |
| 1730 |
++ version_type=linux ;; |
| 1731 |
++ *) |
| 1732 |
++ version_type=freebsd-$objformat ;; |
| 1733 |
++ esac |
| 1734 |
++ |
| 1735 |
+ case $version_type in |
| 1736 |
+ freebsd-elf*) |
| 1737 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1738 |
+@@ -15472,6 +15502,12 @@ freebsd* | dragonfly*) |
| 1739 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1740 |
+ need_version=yes |
| 1741 |
+ ;; |
| 1742 |
++ linux) |
| 1743 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1744 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1745 |
++ need_lib_prefix=no |
| 1746 |
++ need_version=no |
| 1747 |
++ ;; |
| 1748 |
+ esac |
| 1749 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1750 |
+ case $host_os in |
| 1751 |
+@@ -17929,7 +17965,13 @@ freebsd* | dragonfly*) |
| 1752 |
+ # DragonFly does not have aout. When/if they implement a new |
| 1753 |
+ # versioning mechanism, adjust this. |
| 1754 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 1755 |
+- version_type=freebsd-$objformat |
| 1756 |
++ case $host_vendor in |
| 1757 |
++ gentoo) |
| 1758 |
++ version_type=linux ;; |
| 1759 |
++ *) |
| 1760 |
++ version_type=freebsd-$objformat ;; |
| 1761 |
++ esac |
| 1762 |
++ |
| 1763 |
+ case $version_type in |
| 1764 |
+ freebsd-elf*) |
| 1765 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1766 |
+@@ -17940,6 +17982,12 @@ freebsd* | dragonfly*) |
| 1767 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1768 |
+ need_version=yes |
| 1769 |
+ ;; |
| 1770 |
++ linux) |
| 1771 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1772 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1773 |
++ need_lib_prefix=no |
| 1774 |
++ need_version=no |
| 1775 |
++ ;; |
| 1776 |
+ esac |
| 1777 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1778 |
+ case $host_os in |
| 1779 |
|
| 1780 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.20 b/eclass/ELT-patches/fbsd-conf/1.5.20 |
| 1781 |
new file mode 100644 |
| 1782 |
index 0000000..e17920f |
| 1783 |
--- /dev/null |
| 1784 |
+++ b/eclass/ELT-patches/fbsd-conf/1.5.20 |
| 1785 |
@@ -0,0 +1,116 @@ |
| 1786 |
+Index: libtool-1.5.20/configure |
| 1787 |
+=================================================================== |
| 1788 |
+--- libtool-1.5.20.orig/configure |
| 1789 |
++++ libtool-1.5.20/configure |
| 1790 |
+@@ -8441,7 +8441,13 @@ freebsd* | dragonfly*) |
| 1791 |
+ *) objformat=elf ;; |
| 1792 |
+ esac |
| 1793 |
+ fi |
| 1794 |
+- version_type=freebsd-$objformat |
| 1795 |
++ case $host_vendor in |
| 1796 |
++ gentoo) |
| 1797 |
++ version_type=linux ;; |
| 1798 |
++ *) |
| 1799 |
++ version_type=freebsd-$objformat ;; |
| 1800 |
++ esac |
| 1801 |
++ |
| 1802 |
+ case $version_type in |
| 1803 |
+ freebsd-elf*) |
| 1804 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1805 |
+@@ -8452,6 +8458,12 @@ freebsd* | dragonfly*) |
| 1806 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1807 |
+ need_version=yes |
| 1808 |
+ ;; |
| 1809 |
++ linux) |
| 1810 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1811 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1812 |
++ need_lib_prefix=no |
| 1813 |
++ need_version=no |
| 1814 |
++ ;; |
| 1815 |
+ esac |
| 1816 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1817 |
+ case $host_os in |
| 1818 |
+@@ -12228,7 +12240,13 @@ freebsd* | dragonfly*) |
| 1819 |
+ *) objformat=elf ;; |
| 1820 |
+ esac |
| 1821 |
+ fi |
| 1822 |
+- version_type=freebsd-$objformat |
| 1823 |
++ case $host_vendor in |
| 1824 |
++ gentoo) |
| 1825 |
++ version_type=linux ;; |
| 1826 |
++ *) |
| 1827 |
++ version_type=freebsd-$objformat ;; |
| 1828 |
++ esac |
| 1829 |
++ |
| 1830 |
+ case $version_type in |
| 1831 |
+ freebsd-elf*) |
| 1832 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1833 |
+@@ -12239,6 +12257,12 @@ freebsd* | dragonfly*) |
| 1834 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1835 |
+ need_version=yes |
| 1836 |
+ ;; |
| 1837 |
++ linux) |
| 1838 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1839 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1840 |
++ need_lib_prefix=no |
| 1841 |
++ need_version=no |
| 1842 |
++ ;; |
| 1843 |
+ esac |
| 1844 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1845 |
+ case $host_os in |
| 1846 |
+@@ -15492,7 +15516,13 @@ freebsd* | dragonfly*) |
| 1847 |
+ *) objformat=elf ;; |
| 1848 |
+ esac |
| 1849 |
+ fi |
| 1850 |
+- version_type=freebsd-$objformat |
| 1851 |
++ case $host_vendor in |
| 1852 |
++ gentoo) |
| 1853 |
++ version_type=linux ;; |
| 1854 |
++ *) |
| 1855 |
++ version_type=freebsd-$objformat ;; |
| 1856 |
++ esac |
| 1857 |
++ |
| 1858 |
+ case $version_type in |
| 1859 |
+ freebsd-elf*) |
| 1860 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1861 |
+@@ -15503,6 +15533,12 @@ freebsd* | dragonfly*) |
| 1862 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1863 |
+ need_version=yes |
| 1864 |
+ ;; |
| 1865 |
++ linux) |
| 1866 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1867 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1868 |
++ need_lib_prefix=no |
| 1869 |
++ need_version=no |
| 1870 |
++ ;; |
| 1871 |
+ esac |
| 1872 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1873 |
+ case $host_os in |
| 1874 |
+@@ -17968,7 +18004,13 @@ freebsd* | dragonfly*) |
| 1875 |
+ *) objformat=elf ;; |
| 1876 |
+ esac |
| 1877 |
+ fi |
| 1878 |
+- version_type=freebsd-$objformat |
| 1879 |
++ case $host_vendor in |
| 1880 |
++ gentoo) |
| 1881 |
++ version_type=linux ;; |
| 1882 |
++ *) |
| 1883 |
++ version_type=freebsd-$objformat ;; |
| 1884 |
++ esac |
| 1885 |
++ |
| 1886 |
+ case $version_type in |
| 1887 |
+ freebsd-elf*) |
| 1888 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1889 |
+@@ -17979,6 +18021,12 @@ freebsd* | dragonfly*) |
| 1890 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1891 |
+ need_version=yes |
| 1892 |
+ ;; |
| 1893 |
++ linux) |
| 1894 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1895 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1896 |
++ need_lib_prefix=no |
| 1897 |
++ need_version=no |
| 1898 |
++ ;; |
| 1899 |
+ esac |
| 1900 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1901 |
+ case $host_os in |
| 1902 |
|
| 1903 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.20b b/eclass/ELT-patches/fbsd-conf/1.5.20b |
| 1904 |
new file mode 100644 |
| 1905 |
index 0000000..0659b1c |
| 1906 |
--- /dev/null |
| 1907 |
+++ b/eclass/ELT-patches/fbsd-conf/1.5.20b |
| 1908 |
@@ -0,0 +1,61 @@ |
| 1909 |
+Index: tiff-3.8.2/configure |
| 1910 |
+=================================================================== |
| 1911 |
+--- tiff-3.8.2.orig/configure |
| 1912 |
++++ tiff-3.8.2/configure |
| 1913 |
+@@ -8199,7 +8199,14 @@ freebsd* | dragonfly*) |
| 1914 |
+ *) objformat=elf ;; |
| 1915 |
+ esac |
| 1916 |
+ fi |
| 1917 |
+- version_type=freebsd-$objformat |
| 1918 |
++ # Handle Gentoo/FreeBSD as it was Linux |
| 1919 |
++ case $host_vendor in |
| 1920 |
++ gentoo) |
| 1921 |
++ version_type=linux ;; |
| 1922 |
++ *) |
| 1923 |
++ version_type=freebsd-$objformat ;; |
| 1924 |
++ esac |
| 1925 |
++ |
| 1926 |
+ case $version_type in |
| 1927 |
+ freebsd-elf*) |
| 1928 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1929 |
+@@ -8210,6 +8216,12 @@ freebsd* | dragonfly*) |
| 1930 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1931 |
+ need_version=yes |
| 1932 |
+ ;; |
| 1933 |
++ linux) |
| 1934 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1935 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1936 |
++ need_lib_prefix=no |
| 1937 |
++ need_version=no |
| 1938 |
++ ;; |
| 1939 |
+ esac |
| 1940 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1941 |
+ case $host_os in |
| 1942 |
+@@ -19253,7 +19265,13 @@ freebsd* | dragonfly*) |
| 1943 |
+ *) objformat=elf ;; |
| 1944 |
+ esac |
| 1945 |
+ fi |
| 1946 |
+- version_type=freebsd-$objformat |
| 1947 |
++ case $host_vendor in |
| 1948 |
++ gentoo) |
| 1949 |
++ version_type=linux ;; |
| 1950 |
++ *) |
| 1951 |
++ version_type=freebsd-$objformat ;; |
| 1952 |
++ esac |
| 1953 |
++ |
| 1954 |
+ case $version_type in |
| 1955 |
+ freebsd-elf*) |
| 1956 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1957 |
+@@ -19264,6 +19282,12 @@ freebsd* | dragonfly*) |
| 1958 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1959 |
+ need_version=yes |
| 1960 |
+ ;; |
| 1961 |
++ linux) |
| 1962 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 1963 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 1964 |
++ need_lib_prefix=no |
| 1965 |
++ need_version=no |
| 1966 |
++ ;; |
| 1967 |
+ esac |
| 1968 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 1969 |
+ case $host_os in |
| 1970 |
|
| 1971 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.9f b/eclass/ELT-patches/fbsd-conf/1.9f |
| 1972 |
new file mode 100644 |
| 1973 |
index 0000000..f16ddb8 |
| 1974 |
--- /dev/null |
| 1975 |
+++ b/eclass/ELT-patches/fbsd-conf/1.9f |
| 1976 |
@@ -0,0 +1,60 @@ |
| 1977 |
+Index: libtorrent-0.10.0/configure |
| 1978 |
+=================================================================== |
| 1979 |
+--- libtorrent-0.10.0.orig/configure |
| 1980 |
++++ libtorrent-0.10.0/configure |
| 1981 |
+@@ -8173,7 +8173,13 @@ kfreebsd*-gnu) |
| 1982 |
+ |
| 1983 |
+ freebsd*) |
| 1984 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || $ECHO aout` |
| 1985 |
+- version_type=freebsd-$objformat |
| 1986 |
++ case $host_vendor in |
| 1987 |
++ gentoo) |
| 1988 |
++ version_type=linux ;; |
| 1989 |
++ *) |
| 1990 |
++ version_type=freebsd-$objformat ;; |
| 1991 |
++ esac |
| 1992 |
++ |
| 1993 |
+ case $version_type in |
| 1994 |
+ freebsd-elf*) |
| 1995 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 1996 |
+@@ -8184,6 +8190,12 @@ freebsd*) |
| 1997 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 1998 |
+ need_version=yes |
| 1999 |
+ ;; |
| 2000 |
++ linux) |
| 2001 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 2002 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 2003 |
++ need_lib_prefix=no |
| 2004 |
++ need_version=no |
| 2005 |
++ ;; |
| 2006 |
+ esac |
| 2007 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 2008 |
+ case $host_os in |
| 2009 |
+@@ -12461,7 +12473,13 @@ kfreebsd*-gnu) |
| 2010 |
+ |
| 2011 |
+ freebsd*) |
| 2012 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || $ECHO aout` |
| 2013 |
+- version_type=freebsd-$objformat |
| 2014 |
++ case $host_vendor in |
| 2015 |
++ gentoo) |
| 2016 |
++ version_type=linux ;; |
| 2017 |
++ *) |
| 2018 |
++ version_type=freebsd-$objformat ;; |
| 2019 |
++ esac |
| 2020 |
++ |
| 2021 |
+ case $version_type in |
| 2022 |
+ freebsd-elf*) |
| 2023 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
| 2024 |
+@@ -12472,6 +12490,12 @@ freebsd*) |
| 2025 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
| 2026 |
+ need_version=yes |
| 2027 |
+ ;; |
| 2028 |
++ linux) |
| 2029 |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 2030 |
++ soname_spec='${libname}${release}${shared_ext}$major' |
| 2031 |
++ need_lib_prefix=no |
| 2032 |
++ need_version=no |
| 2033 |
++ ;; |
| 2034 |
+ esac |
| 2035 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 2036 |
+ case $host_os in |
| 2037 |
|
| 2038 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.2.0 b/eclass/ELT-patches/fbsd-ltconf/1.2.0 |
| 2039 |
new file mode 100644 |
| 2040 |
index 0000000..7d2f554 |
| 2041 |
--- /dev/null |
| 2042 |
+++ b/eclass/ELT-patches/fbsd-ltconf/1.2.0 |
| 2043 |
@@ -0,0 +1,26 @@ |
| 2044 |
+Index: jpeg-6b/ltconfig |
| 2045 |
+=================================================================== |
| 2046 |
+--- jpeg-6b.orig/ltconfig |
| 2047 |
++++ jpeg-6b/ltconfig |
| 2048 |
+@@ -1126,9 +1126,18 @@ amigaos*) |
| 2049 |
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' |
| 2050 |
+ ;; |
| 2051 |
+ |
| 2052 |
+-freebsd2* | freebsd3*) |
| 2053 |
+- version_type=sunos |
| 2054 |
+- library_names_spec='${libname}${release}.so.$versuffix $libname.so' |
| 2055 |
++freebsd[234567]*) |
| 2056 |
++ case $host_vendor in |
| 2057 |
++ gentoo) |
| 2058 |
++ version_type=linux |
| 2059 |
++ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}.so' |
| 2060 |
++ soname_spec='${libname}${release}.so.$major' |
| 2061 |
++ ;; |
| 2062 |
++ *) |
| 2063 |
++ version_type=sunos |
| 2064 |
++ library_names_spec='${libname}${release}.so.$versuffix $libname.so' |
| 2065 |
++ ;; |
| 2066 |
++ esac |
| 2067 |
+ finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' |
| 2068 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 2069 |
+ ;; |
| 2070 |
|
| 2071 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.3.0 b/eclass/ELT-patches/fbsd-ltconf/1.3.0 |
| 2072 |
new file mode 100644 |
| 2073 |
index 0000000..69aa94e |
| 2074 |
--- /dev/null |
| 2075 |
+++ b/eclass/ELT-patches/fbsd-ltconf/1.3.0 |
| 2076 |
@@ -0,0 +1,32 @@ |
| 2077 |
+Index: libtool-1.3.5/ltconfig |
| 2078 |
+=================================================================== |
| 2079 |
+--- libtool-1.3.5.orig/ltconfig |
| 2080 |
++++ libtool-1.3.5/ltconfig |
| 2081 |
+@@ -1888,7 +1888,13 @@ freebsd1*) |
| 2082 |
+ |
| 2083 |
+ freebsd*) |
| 2084 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 2085 |
+- version_type=freebsd-$objformat |
| 2086 |
++ case $host_vendor in |
| 2087 |
++ gentoo) |
| 2088 |
++ version_type=linux ;; |
| 2089 |
++ *) |
| 2090 |
++ version_type=freebsd-$objformat ;; |
| 2091 |
++ esac |
| 2092 |
++ |
| 2093 |
+ case "$version_type" in |
| 2094 |
+ freebsd-elf*) |
| 2095 |
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' |
| 2096 |
+@@ -1903,6 +1909,12 @@ freebsd*) |
| 2097 |
+ library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
| 2098 |
+ need_version=yes |
| 2099 |
+ ;; |
| 2100 |
++ linux) |
| 2101 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
| 2102 |
++ soname_spec='${libname}${release}.so$major' |
| 2103 |
++ need_lib_prefix=no |
| 2104 |
++ need_version=no |
| 2105 |
++ ;; |
| 2106 |
+ esac |
| 2107 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 2108 |
+ case "$host_os" in |
| 2109 |
|
| 2110 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.4a b/eclass/ELT-patches/fbsd-ltconf/1.4a |
| 2111 |
new file mode 100644 |
| 2112 |
index 0000000..0008407 |
| 2113 |
--- /dev/null |
| 2114 |
+++ b/eclass/ELT-patches/fbsd-ltconf/1.4a |
| 2115 |
@@ -0,0 +1,32 @@ |
| 2116 |
+Index: binutils-2.16.1/ltconfig |
| 2117 |
+=================================================================== |
| 2118 |
+--- binutils-2.16.1.orig/ltconfig |
| 2119 |
++++ binutils-2.16.1/ltconfig |
| 2120 |
+@@ -1129,7 +1129,13 @@ freebsd1*) |
| 2121 |
+ |
| 2122 |
+ freebsd*) |
| 2123 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 2124 |
+- version_type=freebsd-$objformat |
| 2125 |
++ case $host_vendor in |
| 2126 |
++ gentoo) |
| 2127 |
++ version_type=linux ;; |
| 2128 |
++ *) |
| 2129 |
++ version_type=freebsd-$objformat ;; |
| 2130 |
++ esac |
| 2131 |
++ |
| 2132 |
+ case $version_type in |
| 2133 |
+ freebsd-elf*) |
| 2134 |
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' |
| 2135 |
+@@ -1141,6 +1147,12 @@ freebsd*) |
| 2136 |
+ library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
| 2137 |
+ need_version=yes |
| 2138 |
+ ;; |
| 2139 |
++ linux) |
| 2140 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
| 2141 |
++ soname_spec='${libname}${release}.so$major' |
| 2142 |
++ need_lib_prefix=no |
| 2143 |
++ need_version=no |
| 2144 |
++ ;; |
| 2145 |
+ esac |
| 2146 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 2147 |
+ case $host_os in |
| 2148 |
|
| 2149 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 b/eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 |
| 2150 |
new file mode 100644 |
| 2151 |
index 0000000..e88bb45 |
| 2152 |
--- /dev/null |
| 2153 |
+++ b/eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 |
| 2154 |
@@ -0,0 +1,32 @@ |
| 2155 |
+Index: binutils-2.16.1/ltconfig |
| 2156 |
+=================================================================== |
| 2157 |
+--- binutils-2.16.1.orig/ltconfig |
| 2158 |
++++ binutils-2.16.1/ltconfig |
| 2159 |
+@@ -1129,7 +1129,13 @@ freebsd1*) |
| 2160 |
+ |
| 2161 |
+ freebsd*) |
| 2162 |
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` |
| 2163 |
+- version_type=freebsd-$objformat |
| 2164 |
++ case $host_vendor in |
| 2165 |
++ gentoo) |
| 2166 |
++ version_type=linux ;; |
| 2167 |
++ *) |
| 2168 |
++ version_type=freebsd-$objformat ;; |
| 2169 |
++ esac |
| 2170 |
++ |
| 2171 |
+ case $version_type in |
| 2172 |
+ freebsd-elf*) |
| 2173 |
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' |
| 2174 |
+@@ -1141,6 +1147,12 @@ freebsd*) |
| 2175 |
+ library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
| 2176 |
+ need_version=yes |
| 2177 |
+ ;; |
| 2178 |
++ linux) |
| 2179 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
| 2180 |
++ soname_spec='${libname}${release}.so$major' |
| 2181 |
++ need_lib_prefix=no |
| 2182 |
++ need_version=no |
| 2183 |
++ ;; |
| 2184 |
+ esac |
| 2185 |
+ shlibpath_var=LD_LIBRARY_PATH |
| 2186 |
+ case $host_os in |
| 2187 |
|
| 2188 |
diff --git a/eclass/ELT-patches/fix-relink/1.4.0 b/eclass/ELT-patches/fix-relink/1.4.0 |
| 2189 |
new file mode 100644 |
| 2190 |
index 0000000..1b12c9b |
| 2191 |
--- /dev/null |
| 2192 |
+++ b/eclass/ELT-patches/fix-relink/1.4.0 |
| 2193 |
@@ -0,0 +1,63 @@ |
| 2194 |
+--- ltmain.sh 2003-09-24 18:22:17.528129376 +0200 |
| 2195 |
++++ ltmain.sh 2003-09-24 18:23:17.101072912 +0200 |
| 2196 |
+@@ -1582,6 +1582,8 @@ |
| 2197 |
+ # Only check for convenience libraries |
| 2198 |
+ deplibs="$lib $deplibs" |
| 2199 |
+ tmp_libs= |
| 2200 |
++ # PKGW |
| 2201 |
++ dependency_libs= |
| 2202 |
+ for deplib in $dependency_libs; do |
| 2203 |
+ #echo "Adding $deplib to \$deplibs" |
| 2204 |
+ deplibs="$deplib $deplibs" |
| 2205 |
+@@ -1699,6 +1701,8 @@ |
| 2206 |
+ fi |
| 2207 |
+ |
| 2208 |
+ tmp_libs= |
| 2209 |
++ #PKGW |
| 2210 |
++ dependency_libs= |
| 2211 |
+ for deplib in $dependency_libs; do |
| 2212 |
+ case $deplib in |
| 2213 |
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
| 2214 |
+@@ -1860,6 +1864,16 @@ |
| 2215 |
+ add="$dir/$linklib" |
| 2216 |
+ elif test "$hardcode_minus_L" = yes; then |
| 2217 |
+ add_dir="-L$dir" |
| 2218 |
++ # Try looking first in the location we're being installed to. |
| 2219 |
++ if test -n "$inst_prefix_dir"; then |
| 2220 |
++ case "$libdir" in |
| 2221 |
++ [\\/]*) |
| 2222 |
++ # Add the install location to the beginning, minimising possiblilty |
| 2223 |
++ # of linking to older version of the lib already installed. |
| 2224 |
++ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2225 |
++ ;; |
| 2226 |
++ esac |
| 2227 |
++ fi |
| 2228 |
+ add="-l$name" |
| 2229 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 2230 |
+ add_shlibpath="$dir" |
| 2231 |
+@@ -1918,6 +1932,16 @@ |
| 2232 |
+ else |
| 2233 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 2234 |
+ add_dir="-L$libdir" |
| 2235 |
++ # Try looking first in the location we're being installed to. |
| 2236 |
++ if test -n "$inst_prefix_dir"; then |
| 2237 |
++ case "$libdir" in |
| 2238 |
++ [\\/]*) |
| 2239 |
++ # Add the install location to the beginning, minimising possiblilty |
| 2240 |
++ # of linking to older version of the lib already installed. |
| 2241 |
++ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2242 |
++ ;; |
| 2243 |
++ esac |
| 2244 |
++ fi |
| 2245 |
+ add="-l$name" |
| 2246 |
+ fi |
| 2247 |
+ |
| 2248 |
+@@ -2117,7 +2141,7 @@ |
| 2249 |
+ -L*) |
| 2250 |
+ case " $tmp_libs " in |
| 2251 |
+ *" $deplib "*) ;; |
| 2252 |
+- *) tmp_libs="$tmp_libs $deplib" ;; |
| 2253 |
++ *) tmp_libs="$deplib $tmp_libs" ;; |
| 2254 |
+ esac |
| 2255 |
+ ;; |
| 2256 |
+ *) tmp_libs="$tmp_libs $deplib" ;; |
| 2257 |
|
| 2258 |
diff --git a/eclass/ELT-patches/fix-relink/1.4.3 b/eclass/ELT-patches/fix-relink/1.4.3 |
| 2259 |
new file mode 100644 |
| 2260 |
index 0000000..959fe1d |
| 2261 |
--- /dev/null |
| 2262 |
+++ b/eclass/ELT-patches/fix-relink/1.4.3 |
| 2263 |
@@ -0,0 +1,62 @@ |
| 2264 |
+--- ltmain.sh 2003-09-24 19:48:39.367370072 +0200 |
| 2265 |
++++ ltmain.sh 2003-09-24 19:49:31.773403144 +0200 |
| 2266 |
+@@ -1593,6 +1593,8 @@ |
| 2267 |
+ convenience="$convenience $ladir/$objdir/$old_library" |
| 2268 |
+ old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 2269 |
+ tmp_libs= |
| 2270 |
++ # PKGW |
| 2271 |
++ dependency_libs= |
| 2272 |
+ for deplib in $dependency_libs; do |
| 2273 |
+ deplibs="$deplib $deplibs" |
| 2274 |
+ if test "X$duplicate_deps" = "Xyes" ; then |
| 2275 |
+@@ -1710,6 +1712,8 @@ |
| 2276 |
+ fi |
| 2277 |
+ |
| 2278 |
+ tmp_libs= |
| 2279 |
++ #PKGW |
| 2280 |
++ dependency_libs= |
| 2281 |
+ for deplib in $dependency_libs; do |
| 2282 |
+ case $deplib in |
| 2283 |
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
| 2284 |
+@@ -1871,6 +1875,16 @@ |
| 2285 |
+ add="$dir/$linklib" |
| 2286 |
+ elif test "$hardcode_minus_L" = yes; then |
| 2287 |
+ add_dir="-L$dir" |
| 2288 |
++ # Try looking first in the location we're being installed to. |
| 2289 |
++ if test -n "$inst_prefix_dir"; then |
| 2290 |
++ case "$libdir" in |
| 2291 |
++ [\\/]*) |
| 2292 |
++ # Add the install location to the beginning, minimising possiblilty |
| 2293 |
++ # of linking to older version of the lib already installed. |
| 2294 |
++ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2295 |
++ ;; |
| 2296 |
++ esac |
| 2297 |
++ fi |
| 2298 |
+ add="-l$name" |
| 2299 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 2300 |
+ add_shlibpath="$dir" |
| 2301 |
+@@ -1938,11 +1952,13 @@ |
| 2302 |
+ else |
| 2303 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 2304 |
+ # Try looking first in the location we're being installed to. |
| 2305 |
+- add_dir= |
| 2306 |
++ add_dir="-L$dir" |
| 2307 |
+ if test -n "$inst_prefix_dir"; then |
| 2308 |
+ case "$libdir" in |
| 2309 |
+ [\\/]*) |
| 2310 |
+- add_dir="-L$inst_prefix_dir$libdir" |
| 2311 |
++ # Add the install location to the beginning, minimising possiblilty |
| 2312 |
++ # of linking to older version of the lib already installed. |
| 2313 |
++ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2314 |
+ ;; |
| 2315 |
+ esac |
| 2316 |
+ fi |
| 2317 |
+@@ -2146,7 +2162,7 @@ |
| 2318 |
+ -L*) |
| 2319 |
+ case " $tmp_libs " in |
| 2320 |
+ *" $deplib "*) ;; |
| 2321 |
+- *) tmp_libs="$tmp_libs $deplib" ;; |
| 2322 |
++ *) tmp_libs="$deplib $tmp_libs" ;; |
| 2323 |
+ esac |
| 2324 |
+ ;; |
| 2325 |
+ *) tmp_libs="$tmp_libs $deplib" ;; |
| 2326 |
|
| 2327 |
diff --git a/eclass/ELT-patches/fix-relink/1.5.0 b/eclass/ELT-patches/fix-relink/1.5.0 |
| 2328 |
new file mode 100644 |
| 2329 |
index 0000000..29b7db7 |
| 2330 |
--- /dev/null |
| 2331 |
+++ b/eclass/ELT-patches/fix-relink/1.5.0 |
| 2332 |
@@ -0,0 +1,51 @@ |
| 2333 |
+--- ltmain.sh 2003-09-24 18:18:14.961005184 +0200 |
| 2334 |
++++ ltmain.sh 2003-09-24 18:20:11.204333512 +0200 |
| 2335 |
+@@ -2022,6 +2022,8 @@ |
| 2336 |
+ convenience="$convenience $ladir/$objdir/$old_library" |
| 2337 |
+ old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 2338 |
+ tmp_libs= |
| 2339 |
++ # PKGW |
| 2340 |
++ dependency_libs= |
| 2341 |
+ for deplib in $dependency_libs; do |
| 2342 |
+ deplibs="$deplib $deplibs" |
| 2343 |
+ if test "X$duplicate_deps" = "Xyes" ; then |
| 2344 |
+@@ -2143,6 +2145,8 @@ |
| 2345 |
+ fi |
| 2346 |
+ |
| 2347 |
+ tmp_libs= |
| 2348 |
++ #PKGW |
| 2349 |
++ dependency_libs= |
| 2350 |
+ for deplib in $dependency_libs; do |
| 2351 |
+ case $deplib in |
| 2352 |
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
| 2353 |
+@@ -2359,7 +2363,9 @@ |
| 2354 |
+ if test -n "$inst_prefix_dir"; then |
| 2355 |
+ case "$libdir" in |
| 2356 |
+ [\\/]*) |
| 2357 |
+- add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 2358 |
++ # Add the install location to the beginning, minimising possiblilty |
| 2359 |
++ # of linking to older version of the lib already installed. |
| 2360 |
++ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2361 |
+ ;; |
| 2362 |
+ esac |
| 2363 |
+ fi |
| 2364 |
+@@ -2431,7 +2437,9 @@ |
| 2365 |
+ if test -n "$inst_prefix_dir"; then |
| 2366 |
+ case "$libdir" in |
| 2367 |
+ [\\/]*) |
| 2368 |
+- add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 2369 |
++ # Add the install location to the beginning, minimising possiblilty |
| 2370 |
++ # of linking to older version of the lib already installed. |
| 2371 |
++ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
| 2372 |
+ ;; |
| 2373 |
+ esac |
| 2374 |
+ fi |
| 2375 |
+@@ -2691,7 +2699,7 @@ |
| 2376 |
+ -L*) |
| 2377 |
+ case " $tmp_libs " in |
| 2378 |
+ *" $deplib "*) ;; |
| 2379 |
+- *) tmp_libs="$tmp_libs $deplib" ;; |
| 2380 |
++ *) tmp_libs="$deplib $tmp_libs" ;; |
| 2381 |
+ esac |
| 2382 |
+ ;; |
| 2383 |
+ *) tmp_libs="$tmp_libs $deplib" ;; |
| 2384 |
|
| 2385 |
diff --git a/eclass/ELT-patches/gold-conf/2.2.6 b/eclass/ELT-patches/gold-conf/2.2.6 |
| 2386 |
new file mode 100644 |
| 2387 |
index 0000000..048cbad |
| 2388 |
--- /dev/null |
| 2389 |
+++ b/eclass/ELT-patches/gold-conf/2.2.6 |
| 2390 |
@@ -0,0 +1,10 @@ |
| 2391 |
+--- configure.orig |
| 2392 |
++++ configure |
| 2393 |
+@@ -9933,6 +9933,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 2394 |
+ fi |
| 2395 |
+ supports_anon_versioning=no |
| 2396 |
+ case `$LD -v 2>&1` in |
| 2397 |
++ *GNU\ gold*) supports_anon_versioning=yes ;; |
| 2398 |
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
| 2399 |
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
| 2400 |
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
| 2401 |
|
| 2402 |
diff --git a/eclass/ELT-patches/hardcode-relink/1.3d b/eclass/ELT-patches/hardcode-relink/1.3d |
| 2403 |
new file mode 100644 |
| 2404 |
index 0000000..dc7819f |
| 2405 |
--- /dev/null |
| 2406 |
+++ b/eclass/ELT-patches/hardcode-relink/1.3d |
| 2407 |
@@ -0,0 +1,8 @@ |
| 2408 |
+--- ltmain.sh |
| 2409 |
++++ ltmain.sh |
| 2410 |
+@@ -2208,4 +2208,4 @@ |
| 2411 |
+ relink) |
| 2412 |
+- if test "$hardcode_direct" = yes; then |
| 2413 |
++ if false && test "$hardcode_direct" = yes; then |
| 2414 |
+ add="$dir/$linklib" |
| 2415 |
+ elif test "$hardcode_minus_L" = yes; then |
| 2416 |
|
| 2417 |
diff --git a/eclass/ELT-patches/hardcode/1.3d b/eclass/ELT-patches/hardcode/1.3d |
| 2418 |
new file mode 100644 |
| 2419 |
index 0000000..7408b37 |
| 2420 |
--- /dev/null |
| 2421 |
+++ b/eclass/ELT-patches/hardcode/1.3d |
| 2422 |
@@ -0,0 +1,21 @@ |
| 2423 |
+http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html |
| 2424 |
+ |
| 2425 |
+but this patch disables hardcoding independent of inst_prefix_dir at all, |
| 2426 |
+for both hardcode_direct=yes and hardcode_minus_L=yes. |
| 2427 |
+ |
| 2428 |
+If you update this patch, please also update libtool/files/libtool-1.3d-hardcode.patch |
| 2429 |
+ |
| 2430 |
+--- ltmain.in.orig 2008-04-16 15:54:04.000000000 +0200 |
| 2431 |
++++ ltmain.in 2008-04-16 16:21:04.000000000 +0200 |
| 2432 |
+@@ -1900,9 +1900,9 @@ |
| 2433 |
+ add_dir= |
| 2434 |
+ add= |
| 2435 |
+ # Finalize command for both is simple: just hardcode it. |
| 2436 |
+- if test "$hardcode_direct" = yes; then |
| 2437 |
++ if false && test "$hardcode_direct" = yes; then |
| 2438 |
+ add="$libdir/$linklib" |
| 2439 |
+- elif test "$hardcode_minus_L" = yes; then |
| 2440 |
++ elif false && test "$hardcode_minus_L" = yes; then |
| 2441 |
+ add_dir="-L$libdir" |
| 2442 |
+ add="-l$name" |
| 2443 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 2444 |
|
| 2445 |
diff --git a/eclass/ELT-patches/hardcode/2.1b b/eclass/ELT-patches/hardcode/2.1b |
| 2446 |
new file mode 100644 |
| 2447 |
index 0000000..48571f3 |
| 2448 |
--- /dev/null |
| 2449 |
+++ b/eclass/ELT-patches/hardcode/2.1b |
| 2450 |
@@ -0,0 +1,36 @@ |
| 2451 |
+Hardcoding library path does not work with DESTDIR installs. |
| 2452 |
+ |
| 2453 |
+Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'. |
| 2454 |
+According to libtool.m4 (as of libtool-1.5.26), these are: |
| 2455 |
+ *-aix* |
| 2456 |
+ *-hpux9 |
| 2457 |
+ hppa-hpux* (not hppa64 or ia64) |
| 2458 |
+ *-netbsd |
| 2459 |
+ *-openbsd |
| 2460 |
+ *-freebsd |
| 2461 |
+ *-dragonfly |
| 2462 |
+ *-newsos6 |
| 2463 |
+ *-os2 |
| 2464 |
+ *-amigaos |
| 2465 |
+ *-sunos4 |
| 2466 |
+ *-sysv4 |
| 2467 |
+It definitely is required for aix (to support DESTDIR), |
| 2468 |
+although it should help for others too... |
| 2469 |
+ |
| 2470 |
+--- ../../libtool.orig 2009-07-16 18:06:59 +0200 |
| 2471 |
++++ ../../libtool 2009-07-16 18:07:45 +0200 |
| 2472 |
+@@ -6298,13 +6298,13 @@ |
| 2473 |
+ add_dir= |
| 2474 |
+ add= |
| 2475 |
+ # Finalize command for both is simple: just hardcode it. |
| 2476 |
+ if test "$hardcode_direct" = yes && |
| 2477 |
+ test "$hardcode_direct_absolute" = no; then |
| 2478 |
+ add="$libdir/$linklib" |
| 2479 |
+- elif test "$hardcode_minus_L" = yes; then |
| 2480 |
++ elif false && test "$hardcode_minus_L" = yes; then |
| 2481 |
+ add_dir="-L$libdir" |
| 2482 |
+ add="-l$name" |
| 2483 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 2484 |
+ case :$finalize_shlibpath: in |
| 2485 |
+ *":$libdir:"*) ;; |
| 2486 |
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 2487 |
|
| 2488 |
diff --git a/eclass/ELT-patches/hc-flag-ld/1.5 b/eclass/ELT-patches/hc-flag-ld/1.5 |
| 2489 |
new file mode 100644 |
| 2490 |
index 0000000..bf88873 |
| 2491 |
--- /dev/null |
| 2492 |
+++ b/eclass/ELT-patches/hc-flag-ld/1.5 |
| 2493 |
@@ -0,0 +1,18 @@ |
| 2494 |
+http://lists.gnu.org/archive/html/libtool/2006-01/msg00012.html |
| 2495 |
+ |
| 2496 |
+--- ltmain.sh.orig 2007-11-19 17:07:34.946648000 +0100 |
| 2497 |
++++ ltmain.sh 2007-11-19 17:07:57.785975000 +0100 |
| 2498 |
+@@ -3915,8 +3915,11 @@ |
| 2499 |
+ test -n "$hardcode_libdirs"; then |
| 2500 |
+ libdir="$hardcode_libdirs" |
| 2501 |
+ if test -n "$hardcode_libdir_flag_spec_ld"; then |
| 2502 |
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
| 2503 |
+- else |
| 2504 |
++ case $archive_cmds in |
| 2505 |
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; |
| 2506 |
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; |
| 2507 |
++ esac |
| 2508 |
++ else |
| 2509 |
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
| 2510 |
+ fi |
| 2511 |
+ fi |
| 2512 |
|
| 2513 |
diff --git a/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath b/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath |
| 2514 |
new file mode 100644 |
| 2515 |
index 0000000..27fef48 |
| 2516 |
--- /dev/null |
| 2517 |
+++ b/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath |
| 2518 |
@@ -0,0 +1,24 @@ |
| 2519 |
+must not search /usr/local in prefix |
| 2520 |
+ |
| 2521 |
+--- configure.orig 2007-12-02 19:14:55 +0100 |
| 2522 |
++++ configure 2007-12-02 19:14:59 +0100 |
| 2523 |
+@@ -8920,9 +8920,17 @@ |
| 2524 |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
| 2525 |
+ soname_spec='${libname}${release}${shared_ext}$major' |
| 2526 |
+ if test "X$HPUX_IA64_MODE" = X32; then |
| 2527 |
+- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
| 2528 |
++ if test "$GCC" = yes; then |
| 2529 |
++ sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux32" |
| 2530 |
++ else |
| 2531 |
++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
| 2532 |
++ fi |
| 2533 |
+ else |
| 2534 |
+- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
| 2535 |
++ if test "$GCC" = yes; then |
| 2536 |
++ sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux64" |
| 2537 |
++ else |
| 2538 |
++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
| 2539 |
++ fi |
| 2540 |
+ fi |
| 2541 |
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 2542 |
+ ;; |
| 2543 |
|
| 2544 |
diff --git a/eclass/ELT-patches/install-sh/1.5 b/eclass/ELT-patches/install-sh/1.5 |
| 2545 |
new file mode 100644 |
| 2546 |
index 0000000..1b8b20b |
| 2547 |
--- /dev/null |
| 2548 |
+++ b/eclass/ELT-patches/install-sh/1.5 |
| 2549 |
@@ -0,0 +1,14 @@ |
| 2550 |
+--- install-sh 2007-07-04 14:36:49 +0100 |
| 2551 |
++++ install-sh 2007-09-14 11:00:41 +0100 |
| 2552 |
+@@ -192,7 +192,10 @@ |
| 2553 |
+ |
| 2554 |
+ if [ x"$dir_arg" != x ] |
| 2555 |
+ then |
| 2556 |
+- $doit $instcmd $dst && |
| 2557 |
++ { $doit $instcmd "$dst" || lasterr=$? |
| 2558 |
++ # It's ok for mkdir to fail if the directory already exists. |
| 2559 |
++ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
| 2560 |
++ } && |
| 2561 |
+ |
| 2562 |
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && |
| 2563 |
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && |
| 2564 |
|
| 2565 |
diff --git a/eclass/ELT-patches/install-sh/1.5.4 b/eclass/ELT-patches/install-sh/1.5.4 |
| 2566 |
new file mode 100644 |
| 2567 |
index 0000000..0b1c220 |
| 2568 |
--- /dev/null |
| 2569 |
+++ b/eclass/ELT-patches/install-sh/1.5.4 |
| 2570 |
@@ -0,0 +1,14 @@ |
| 2571 |
+--- install-sh 2006-03-25 20:04:46 +0000 |
| 2572 |
++++ install-sh 2007-09-14 10:53:29 +0100 |
| 2573 |
+@@ -246,7 +246,10 @@ |
| 2574 |
+ fi |
| 2575 |
+ |
| 2576 |
+ if test -n "$dir_arg"; then |
| 2577 |
+- $doit $mkdircmd "$dst" \ |
| 2578 |
++ { $doit $mkdircmd "$dst" || lasterr=$? |
| 2579 |
++ # It's ok for mkdir to fail if the directory already exists. |
| 2580 |
++ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
| 2581 |
++ } \ |
| 2582 |
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
| 2583 |
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
| 2584 |
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |
| 2585 |
|
| 2586 |
diff --git a/eclass/ELT-patches/install-sh/1.5.6 b/eclass/ELT-patches/install-sh/1.5.6 |
| 2587 |
new file mode 100644 |
| 2588 |
index 0000000..d107740 |
| 2589 |
--- /dev/null |
| 2590 |
+++ b/eclass/ELT-patches/install-sh/1.5.6 |
| 2591 |
@@ -0,0 +1,14 @@ |
| 2592 |
+--- install-sh 2006-03-14 12:57:54 -0300 |
| 2593 |
++++ install-sh 2008-06-19 22:23:04 -0300 |
| 2594 |
+@@ -240,7 +240,10 @@ |
| 2595 |
+ fi |
| 2596 |
+ |
| 2597 |
+ if test -n "$dir_arg"; then |
| 2598 |
+- $doit $instcmd "$dst" \ |
| 2599 |
++ { $doit $instcmd "$dst" || lasterr=$? |
| 2600 |
++ # It's ok for mkdir to fail if the directory already exists. |
| 2601 |
++ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
| 2602 |
++ } \ |
| 2603 |
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
| 2604 |
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
| 2605 |
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |
| 2606 |
|
| 2607 |
diff --git a/eclass/ELT-patches/irix-ltmain/2.2.6 b/eclass/ELT-patches/irix-ltmain/2.2.6 |
| 2608 |
new file mode 100644 |
| 2609 |
index 0000000..7091637 |
| 2610 |
--- /dev/null |
| 2611 |
+++ b/eclass/ELT-patches/irix-ltmain/2.2.6 |
| 2612 |
@@ -0,0 +1,30 @@ |
| 2613 |
+I notice that $EPREFIX/usr/share/libtool/config/ltmain.sh also has this |
| 2614 |
+stray increment - so I'd assume that this is a bug in libtool (which is |
| 2615 |
+perhaps trying to fix a deprecated behaviour of old IRIX versions?). |
| 2616 |
+ |
| 2617 |
+http://bugs.gentoo.org/show_bug.cgi?id=301520 |
| 2618 |
+ |
| 2619 |
+ |
| 2620 |
+--- ltmain.sh.dist 2010-01-19 14:04:22.101603800 +0000 |
| 2621 |
++++ ltmain.sh 2010-01-19 14:08:29.361500240 +0000 |
| 2622 |
+@@ -6225,7 +6225,6 @@ func_mode_link () |
| 2623 |
+ current=$func_arith_result |
| 2624 |
+ age="$number_minor" |
| 2625 |
+ revision="$number_minor" |
| 2626 |
+- lt_irix_increment=no |
| 2627 |
+ ;; |
| 2628 |
+ esac |
| 2629 |
+ ;; |
| 2630 |
+@@ -6297,11 +6296,7 @@ func_mode_link () |
| 2631 |
+ ;; |
| 2632 |
+ |
| 2633 |
+ irix | nonstopux) |
| 2634 |
+- if test "X$lt_irix_increment" = "Xno"; then |
| 2635 |
+- func_arith $current - $age |
| 2636 |
+- else |
| 2637 |
+- func_arith $current - $age + 1 |
| 2638 |
+- fi |
| 2639 |
++ func_arith $current - $age |
| 2640 |
+ major=$func_arith_result |
| 2641 |
+ |
| 2642 |
+ case $version_type in |
| 2643 |
|
| 2644 |
diff --git a/eclass/ELT-patches/ltmain/1.5 b/eclass/ELT-patches/ltmain/1.5 |
| 2645 |
new file mode 100644 |
| 2646 |
index 0000000..39abee0 |
| 2647 |
--- /dev/null |
| 2648 |
+++ b/eclass/ELT-patches/ltmain/1.5 |
| 2649 |
@@ -0,0 +1,18 @@ |
| 2650 |
+--- ltmain.sh 2007-09-15 07:35:19 +0100 |
| 2651 |
++++ ltmain.sh 2004-01-25 12:40:26 +0000 |
| 2652 |
+@@ -1854,6 +1840,15 @@ |
| 2653 |
+ lib= |
| 2654 |
+ found=no |
| 2655 |
+ case $deplib in |
| 2656 |
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) |
| 2657 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 2658 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 2659 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 2660 |
++ else |
| 2661 |
++ deplibs="$deplib $deplibs" |
| 2662 |
++ fi |
| 2663 |
++ continue |
| 2664 |
++ ;; |
| 2665 |
+ -l*) |
| 2666 |
+ if test "$linkmode" != lib && test "$linkmode" != prog; then |
| 2667 |
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 |
| 2668 |
|
| 2669 |
diff --git a/eclass/ELT-patches/max_cmd_len/1.5.0 b/eclass/ELT-patches/max_cmd_len/1.5.0 |
| 2670 |
new file mode 100644 |
| 2671 |
index 0000000..6d5f88b |
| 2672 |
--- /dev/null |
| 2673 |
+++ b/eclass/ELT-patches/max_cmd_len/1.5.0 |
| 2674 |
@@ -0,0 +1,33 @@ |
| 2675 |
+--- ltmain.sh 2004-02-11 20:55:14.587581248 +0200 |
| 2676 |
++++ ltmain.sh 2004-02-11 21:15:33.467283368 +0200 |
| 2677 |
+@@ -117,6 +117,30 @@ |
| 2678 |
+ execute_dlfiles= |
| 2679 |
+ lo2o="s/\\.lo\$/.${objext}/" |
| 2680 |
+ o2lo="s/\\.${objext}\$/.lo/" |
| 2681 |
++ |
| 2682 |
++if test -z "$max_cmd_len"; then |
| 2683 |
++ i=0 |
| 2684 |
++ testring="ABCD" |
| 2685 |
++ new_result= |
| 2686 |
++ |
| 2687 |
++ # If test is not a shell built-in, we'll probably end up computing a |
| 2688 |
++ # maximum length that is only half of the actual maximum length, but |
| 2689 |
++ # we can't tell. |
| 2690 |
++ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ |
| 2691 |
++ = "XX$testring") >/dev/null 2>&1 && |
| 2692 |
++ new_result=`expr "X$testring" : ".*" 2>&1` && |
| 2693 |
++ max_cmd_len="$new_result" && |
| 2694 |
++ test $i != 17 # 1/2 MB should be enough |
| 2695 |
++ do |
| 2696 |
++ i=`expr $i + 1` |
| 2697 |
++ testring="$testring$testring" |
| 2698 |
++ done |
| 2699 |
++ testring= |
| 2700 |
++ # Add a significant safety factor because C++ compilers can tack on massive |
| 2701 |
++ # amounts of additional arguments before passing them to the linker. |
| 2702 |
++ # It appears as though 1/2 is a usable value. |
| 2703 |
++ max_cmd_len=`expr $max_cmd_len \/ 2` |
| 2704 |
++fi |
| 2705 |
+ |
| 2706 |
+ ##################################### |
| 2707 |
+ # Shell function definitions: |
| 2708 |
|
| 2709 |
diff --git a/eclass/ELT-patches/max_cmd_len/1.5.14 b/eclass/ELT-patches/max_cmd_len/1.5.14 |
| 2710 |
new file mode 100644 |
| 2711 |
index 0000000..8f299e8 |
| 2712 |
--- /dev/null |
| 2713 |
+++ b/eclass/ELT-patches/max_cmd_len/1.5.14 |
| 2714 |
@@ -0,0 +1,33 @@ |
| 2715 |
+--- ltmain.sh |
| 2716 |
++++ ltmain.sh |
| 2717 |
+@@ -136,6 +136,30 @@ |
| 2718 |
+ lo2o="s/\\.lo\$/.${objext}/" |
| 2719 |
+ o2lo="s/\\.${objext}\$/.lo/" |
| 2720 |
+ quote_scanset='[[~#^*{};<>?'"'"' ]' |
| 2721 |
++ |
| 2722 |
++if test -z "$max_cmd_len"; then |
| 2723 |
++ i=0 |
| 2724 |
++ testring="ABCD" |
| 2725 |
++ new_result= |
| 2726 |
++ |
| 2727 |
++ # If test is not a shell built-in, we'll probably end up computing a |
| 2728 |
++ # maximum length that is only half of the actual maximum length, but |
| 2729 |
++ # we can't tell. |
| 2730 |
++ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ |
| 2731 |
++ = "XX$testring") >/dev/null 2>&1 && |
| 2732 |
++ new_result=`expr "X$testring" : ".*" 2>&1` && |
| 2733 |
++ max_cmd_len="$new_result" && |
| 2734 |
++ test "$i" != 17 # 1/2 MB should be enough |
| 2735 |
++ do |
| 2736 |
++ i=`expr $i + 1` |
| 2737 |
++ testring="$testring$testring" |
| 2738 |
++ done |
| 2739 |
++ testring= |
| 2740 |
++ # Add a significant safety factor because C++ compilers can tack on massive |
| 2741 |
++ # amounts of additional arguments before passing them to the linker. |
| 2742 |
++ # It appears as though 1/2 is a usable value. |
| 2743 |
++ max_cmd_len=`expr $max_cmd_len \/ 2` |
| 2744 |
++fi |
| 2745 |
+ |
| 2746 |
+ ##################################### |
| 2747 |
+ # Shell function definitions: |
| 2748 |
|
| 2749 |
diff --git a/eclass/ELT-patches/max_cmd_len/1.5.20 b/eclass/ELT-patches/max_cmd_len/1.5.20 |
| 2750 |
new file mode 100644 |
| 2751 |
index 0000000..76dc213 |
| 2752 |
--- /dev/null |
| 2753 |
+++ b/eclass/ELT-patches/max_cmd_len/1.5.20 |
| 2754 |
@@ -0,0 +1,33 @@ |
| 2755 |
+--- ltmain.sh |
| 2756 |
++++ ltmain.sh |
| 2757 |
+@@ -136,6 +136,30 @@ |
| 2758 |
+ execute_dlfiles= |
| 2759 |
+ lo2o="s/\\.lo\$/.${objext}/" |
| 2760 |
+ o2lo="s/\\.${objext}\$/.lo/" |
| 2761 |
++ |
| 2762 |
++if test -z "$max_cmd_len"; then |
| 2763 |
++ i=0 |
| 2764 |
++ testring="ABCD" |
| 2765 |
++ new_result= |
| 2766 |
++ |
| 2767 |
++ # If test is not a shell built-in, we'll probably end up computing a |
| 2768 |
++ # maximum length that is only half of the actual maximum length, but |
| 2769 |
++ # we can't tell. |
| 2770 |
++ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ |
| 2771 |
++ = "XX$testring") >/dev/null 2>&1 && |
| 2772 |
++ new_result=`expr "X$testring" : ".*" 2>&1` && |
| 2773 |
++ max_cmd_len="$new_result" && |
| 2774 |
++ test "$i" != 17 # 1/2 MB should be enough |
| 2775 |
++ do |
| 2776 |
++ i=`expr $i + 1` |
| 2777 |
++ testring="$testring$testring" |
| 2778 |
++ done |
| 2779 |
++ testring= |
| 2780 |
++ # Add a significant safety factor because C++ compilers can tack on massive |
| 2781 |
++ # amounts of additional arguments before passing them to the linker. |
| 2782 |
++ # It appears as though 1/2 is a usable value. |
| 2783 |
++ max_cmd_len=`expr $max_cmd_len \/ 2` |
| 2784 |
++fi |
| 2785 |
+ |
| 2786 |
+ ##################################### |
| 2787 |
+ # Shell function definitions: |
| 2788 |
|
| 2789 |
diff --git a/eclass/ELT-patches/mint-conf/2.2.6 b/eclass/ELT-patches/mint-conf/2.2.6 |
| 2790 |
new file mode 100644 |
| 2791 |
index 0000000..34f2e5f |
| 2792 |
--- /dev/null |
| 2793 |
+++ b/eclass/ELT-patches/mint-conf/2.2.6 |
| 2794 |
@@ -0,0 +1,15 @@ |
| 2795 |
+Calculating the max args here takes hours. |
| 2796 |
+ |
| 2797 |
+--- configure |
| 2798 |
++++ configure |
| 2799 |
+@@ -7351,6 +7351,10 @@ |
| 2800 |
+ lt_cv_sys_max_cmd_len=8192; |
| 2801 |
+ ;; |
| 2802 |
+ |
| 2803 |
++ mint*) |
| 2804 |
++ lt_cv_sys_max_cmd_len=8192; |
| 2805 |
++ ;; |
| 2806 |
++ |
| 2807 |
+ amigaos*) |
| 2808 |
+ # On AmigaOS with pdksh, this test takes hours, literally. |
| 2809 |
+ # So we just punt and use a minimum line length of 8192. |
| 2810 |
|
| 2811 |
diff --git a/eclass/ELT-patches/no-lc/1.3d b/eclass/ELT-patches/no-lc/1.3d |
| 2812 |
new file mode 100644 |
| 2813 |
index 0000000..de20b0c |
| 2814 |
--- /dev/null |
| 2815 |
+++ b/eclass/ELT-patches/no-lc/1.3d |
| 2816 |
@@ -0,0 +1,13 @@ |
| 2817 |
+--- release-1-3d.orig 2009-12-03 17:05:15.608916799 +0100 |
| 2818 |
++++ release-1-3d 2009-12-14 22:01:06.634927600 +0100 |
| 2819 |
+@@ -1035,6 +1035,10 @@ |
| 2820 |
+ esac |
| 2821 |
+ elif test "$arg" = "-lm"; then |
| 2822 |
+ case $host in |
| 2823 |
++ *-*-hpux*) |
| 2824 |
++ # Compiler inserts libc in the correct place for threads to work |
| 2825 |
++ test "X$arg" = "X-lc" && continue |
| 2826 |
++ ;; |
| 2827 |
+ *-*-cygwin* | *-*-pw32* | *-*-beos*) |
| 2828 |
+ # These systems don't actually have math library (as such) |
| 2829 |
+ continue |
| 2830 |
|
| 2831 |
diff --git a/eclass/ELT-patches/no-lc/1.5.22 b/eclass/ELT-patches/no-lc/1.5.22 |
| 2832 |
new file mode 100644 |
| 2833 |
index 0000000..786284d |
| 2834 |
--- /dev/null |
| 2835 |
+++ b/eclass/ELT-patches/no-lc/1.5.22 |
| 2836 |
@@ -0,0 +1,11 @@ |
| 2837 |
+--- release-1-5-22.orig 2009-12-03 17:05:15.605534999 +0100 |
| 2838 |
++++ release-1-5-22 2009-12-14 21:56:58.884956366 +0100 |
| 2839 |
+@@ -1573,7 +1573,7 @@ |
| 2840 |
+ # Causes problems with __ctype |
| 2841 |
+ test "X$arg" = "X-lc" && continue |
| 2842 |
+ ;; |
| 2843 |
+- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) |
| 2844 |
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX* | *-*-hpux*) |
| 2845 |
+ # Compiler inserts libc in the correct place for threads to work |
| 2846 |
+ test "X$arg" = "X-lc" && continue |
| 2847 |
+ ;; |
| 2848 |
|
| 2849 |
diff --git a/eclass/ELT-patches/nocxx/nocxx-2.64.patch b/eclass/ELT-patches/nocxx/nocxx-2.64.patch |
| 2850 |
new file mode 100644 |
| 2851 |
index 0000000..4b10e46 |
| 2852 |
--- /dev/null |
| 2853 |
+++ b/eclass/ELT-patches/nocxx/nocxx-2.64.patch |
| 2854 |
@@ -0,0 +1,13 @@ |
| 2855 |
+--- a/configure |
| 2856 |
++++ b/configure |
| 2857 |
+@@ -5148,8 +5148,8 @@ |
| 2858 |
+ else |
| 2859 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 2860 |
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2861 |
+-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check |
| 2862 |
+-See \`config.log' for more details" "$LINENO" 5; } |
| 2863 |
++$as_echo "See \`config.log' for more details." >&5; |
| 2864 |
++$ac_echo "C++ sucks, ignoring ..." >&5; } |
| 2865 |
+ fi |
| 2866 |
+ |
| 2867 |
+ ac_ext=c |
| 2868 |
|
| 2869 |
diff --git a/eclass/ELT-patches/nocxx/nocxx.patch b/eclass/ELT-patches/nocxx/nocxx.patch |
| 2870 |
new file mode 100644 |
| 2871 |
index 0000000..4b32692 |
| 2872 |
--- /dev/null |
| 2873 |
+++ b/eclass/ELT-patches/nocxx/nocxx.patch |
| 2874 |
@@ -0,0 +1,15 @@ |
| 2875 |
+--- a/configure |
| 2876 |
++++ b/configure |
| 2877 |
+@@ -5148,10 +5148,8 @@ |
| 2878 |
+ : |
| 2879 |
+ else |
| 2880 |
+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check |
| 2881 |
+-See \`config.log' for more details." >&5 |
| 2882 |
+-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check |
| 2883 |
+-See \`config.log' for more details." >&2;} |
| 2884 |
+- { (exit 1); exit 1; }; } |
| 2885 |
++See \`config.log' for more details." >&5;} |
| 2886 |
++ { echo "C++ sucks, ignoring ..." >&5; }; } |
| 2887 |
+ fi |
| 2888 |
+ |
| 2889 |
+ ac_ext=cc |
| 2890 |
|
| 2891 |
diff --git a/eclass/ELT-patches/portage/1.2.0 b/eclass/ELT-patches/portage/1.2.0 |
| 2892 |
new file mode 100644 |
| 2893 |
index 0000000..70b0261 |
| 2894 |
--- /dev/null |
| 2895 |
+++ b/eclass/ELT-patches/portage/1.2.0 |
| 2896 |
@@ -0,0 +1,7 @@ |
| 2897 |
+# Dummy patch, not needed by libtool-1.2 |
| 2898 |
+ |
| 2899 |
+--- ltmain.sh |
| 2900 |
++++ ltmain.sh |
| 2901 |
+@@ -32,1 +32,1 @@ |
| 2902 |
+-PACKAGE=libtool |
| 2903 |
++PACKAGE=libtool |
| 2904 |
|
| 2905 |
diff --git a/eclass/ELT-patches/portage/1.3.0c b/eclass/ELT-patches/portage/1.3.0c |
| 2906 |
new file mode 100644 |
| 2907 |
index 0000000..ad071ae |
| 2908 |
--- /dev/null |
| 2909 |
+++ b/eclass/ELT-patches/portage/1.3.0c |
| 2910 |
@@ -0,0 +1,66 @@ |
| 2911 |
+--- ltmain.sh 2005-09-02 22:19:17.000000000 +0200 |
| 2912 |
++++ ltmain.sh 2005-09-02 22:20:55.000000000 +0200 |
| 2913 |
+@@ -3769,9 +3769,50 @@ |
| 2914 |
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
| 2915 |
+ exit 1 |
| 2916 |
+ fi |
| 2917 |
+- newdependency_libs="$newdependency_libs $libdir/$name" |
| 2918 |
++ # We do not want portage's install root ($D) present. Check only for |
| 2919 |
++ # this if the .la is being installed. |
| 2920 |
++ if test "$installed" = yes && test "$D"; then |
| 2921 |
++ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 2922 |
++ else |
| 2923 |
++ mynewdependency_lib="$libdir/$name" |
| 2924 |
++ fi |
| 2925 |
++ # Do not add duplicates |
| 2926 |
++ if test "$mynewdependency_lib"; then |
| 2927 |
++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 2928 |
++ if test -z "$my_little_ninja_foo_1"; then |
| 2929 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 2930 |
++ fi |
| 2931 |
++ fi |
| 2932 |
++ ;; |
| 2933 |
++ *) |
| 2934 |
++ if test "$installed" = yes; then |
| 2935 |
++ # Rather use S=WORKDIR if our version of portage supports it. |
| 2936 |
++ # This is because some ebuild (gcc) do not use $S as buildroot. |
| 2937 |
++ if test "$WORKDIR"; then |
| 2938 |
++ S="$WORKDIR" |
| 2939 |
++ fi |
| 2940 |
++ # We do not want portage's build root ($S) present. |
| 2941 |
++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
| 2942 |
++ # We do not want portage's install root ($D) present. |
| 2943 |
++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
| 2944 |
++ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
| 2945 |
++ mynewdependency_lib="" |
| 2946 |
++ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
| 2947 |
++ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 2948 |
++ else |
| 2949 |
++ mynewdependency_lib="$deplib" |
| 2950 |
++ fi |
| 2951 |
++ else |
| 2952 |
++ mynewdependency_lib="$deplib" |
| 2953 |
++ fi |
| 2954 |
++ # Do not add duplicates |
| 2955 |
++ if test "$mynewdependency_lib"; then |
| 2956 |
++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 2957 |
++ if test -z "$my_little_ninja_foo_4"; then |
| 2958 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 2959 |
++ fi |
| 2960 |
++ fi |
| 2961 |
+ ;; |
| 2962 |
+- *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 2963 |
+ esac |
| 2964 |
+ done |
| 2965 |
+ dependency_libs="$newdependency_libs" |
| 2966 |
+@@ -3799,6 +3840,10 @@ |
| 2967 |
+ dlprefiles="$newdlprefiles" |
| 2968 |
+ fi |
| 2969 |
+ $rm $output |
| 2970 |
++ # Do not add duplicates |
| 2971 |
++ if test "$installed" = yes && test "$D"; then |
| 2972 |
++ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 2973 |
++ fi |
| 2974 |
+ $echo > $output "\ |
| 2975 |
+ # $outputname - a libtool library file |
| 2976 |
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |
| 2977 |
|
| 2978 |
diff --git a/eclass/ELT-patches/portage/1.3.3 b/eclass/ELT-patches/portage/1.3.3 |
| 2979 |
new file mode 100644 |
| 2980 |
index 0000000..731076b |
| 2981 |
--- /dev/null |
| 2982 |
+++ b/eclass/ELT-patches/portage/1.3.3 |
| 2983 |
@@ -0,0 +1,71 @@ |
| 2984 |
+--- ltmain.sh 2005-05-13 10:53:28.000000000 +0200 |
| 2985 |
++++ ltmain.sh 2005-05-13 11:44:15.000000000 +0200 |
| 2986 |
+@@ -3078,6 +3078,68 @@ |
| 2987 |
+ break |
| 2988 |
+ fi |
| 2989 |
+ output="$output_objdir/$outputname"i |
| 2990 |
++ # Replace all uninstalled libtool libraries with the installed ones |
| 2991 |
++ newdependency_libs= |
| 2992 |
++ for deplib in $dependency_libs; do |
| 2993 |
++ case $deplib in |
| 2994 |
++ *.la) |
| 2995 |
++ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` |
| 2996 |
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 2997 |
++ if test -z "$libdir"; then |
| 2998 |
++ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
| 2999 |
++ exit $EXIT_FAILURE |
| 3000 |
++ fi |
| 3001 |
++ # We do not want portage's install root ($D) present. Check only for |
| 3002 |
++ # this if the .la is being installed. |
| 3003 |
++ if test "$installed" = yes && test "$D"; then |
| 3004 |
++ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3005 |
++ else |
| 3006 |
++ mynewdependency_lib="$libdir/$name" |
| 3007 |
++ fi |
| 3008 |
++ # Do not add duplicates |
| 3009 |
++ if test "$mynewdependency_lib"; then |
| 3010 |
++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3011 |
++ if test -z "$my_little_ninja_foo_1"; then |
| 3012 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3013 |
++ fi |
| 3014 |
++ fi |
| 3015 |
++ ;; |
| 3016 |
++ *) |
| 3017 |
++ if test "$installed" = yes; then |
| 3018 |
++ # Rather use S=WORKDIR if our version of portage supports it. |
| 3019 |
++ # This is because some ebuild (gcc) do not use $S as buildroot. |
| 3020 |
++ if test "$WORKDIR"; then |
| 3021 |
++ S="$WORKDIR" |
| 3022 |
++ fi |
| 3023 |
++ # We do not want portage's build root ($S) present. |
| 3024 |
++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
| 3025 |
++ # We do not want portage's install root ($D) present. |
| 3026 |
++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
| 3027 |
++ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
| 3028 |
++ mynewdependency_lib="" |
| 3029 |
++ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
| 3030 |
++ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3031 |
++ else |
| 3032 |
++ mynewdependency_lib="$deplib" |
| 3033 |
++ fi |
| 3034 |
++ else |
| 3035 |
++ mynewdependency_lib="$deplib" |
| 3036 |
++ fi |
| 3037 |
++ # Do not add duplicates |
| 3038 |
++ if test "$mynewdependency_lib"; then |
| 3039 |
++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3040 |
++ if test -z "$my_little_ninja_foo_4"; then |
| 3041 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3042 |
++ fi |
| 3043 |
++ fi |
| 3044 |
++ ;; |
| 3045 |
++ esac |
| 3046 |
++ done |
| 3047 |
++ dependency_libs="$newdependency_libs" |
| 3048 |
++ fi |
| 3049 |
++ # Do not add duplicates |
| 3050 |
++ if test "$installed" = yes && test "$D"; then |
| 3051 |
++ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3052 |
+ fi |
| 3053 |
+ $rm $output |
| 3054 |
+ $echo > $output "\ |
| 3055 |
|
| 3056 |
diff --git a/eclass/ELT-patches/portage/1.4.0 b/eclass/ELT-patches/portage/1.4.0 |
| 3057 |
new file mode 100644 |
| 3058 |
index 0000000..5566a39 |
| 3059 |
--- /dev/null |
| 3060 |
+++ b/eclass/ELT-patches/portage/1.4.0 |
| 3061 |
@@ -0,0 +1,74 @@ |
| 3062 |
+Note that if you update this patch, please update this one as well: |
| 3063 |
+ |
| 3064 |
+ eclass/ELT-patches/portage/1.4.1 |
| 3065 |
+ |
| 3066 |
+The file name can stay 1.4.1, as it will still apply to all versions. Only |
| 3067 |
+when a new version of libtool comes out that it do not apply to, then the |
| 3068 |
+name should be bumped, but the patch content should stay fairly the same. |
| 3069 |
+ |
| 3070 |
+--- ltmain.sh Wed Apr 3 01:19:37 2002 |
| 3071 |
++++ ltmain.sh Sun May 26 19:50:52 2002 |
| 3072 |
+@@ -3940,9 +3940,50 @@ |
| 3073 |
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
| 3074 |
+ exit 1 |
| 3075 |
+ fi |
| 3076 |
+- newdependency_libs="$newdependency_libs $libdir/$name" |
| 3077 |
++ # We do not want portage's install root ($D) present. Check only for |
| 3078 |
++ # this if the .la is being installed. |
| 3079 |
++ if test "$installed" = yes && test "$D"; then |
| 3080 |
++ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3081 |
++ else |
| 3082 |
++ mynewdependency_lib="$libdir/$name" |
| 3083 |
++ fi |
| 3084 |
++ # Do not add duplicates |
| 3085 |
++ if test "$mynewdependency_lib"; then |
| 3086 |
++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3087 |
++ if test -z "$my_little_ninja_foo_1"; then |
| 3088 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3089 |
++ fi |
| 3090 |
++ fi |
| 3091 |
++ ;; |
| 3092 |
++ *) |
| 3093 |
++ if test "$installed" = yes; then |
| 3094 |
++ # Rather use S=WORKDIR if our version of portage supports it. |
| 3095 |
++ # This is because some ebuild (gcc) do not use $S as buildroot. |
| 3096 |
++ if test "$WORKDIR"; then |
| 3097 |
++ S="$WORKDIR" |
| 3098 |
++ fi |
| 3099 |
++ # We do not want portage's build root ($S) present. |
| 3100 |
++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
| 3101 |
++ # We do not want portage's install root ($D) present. |
| 3102 |
++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
| 3103 |
++ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
| 3104 |
++ mynewdependency_lib="" |
| 3105 |
++ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
| 3106 |
++ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3107 |
++ else |
| 3108 |
++ mynewdependency_lib="$deplib" |
| 3109 |
++ fi |
| 3110 |
++ else |
| 3111 |
++ mynewdependency_lib="$deplib" |
| 3112 |
++ fi |
| 3113 |
++ # Do not add duplicates |
| 3114 |
++ if test "$mynewdependency_lib"; then |
| 3115 |
++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3116 |
++ if test -z "$my_little_ninja_foo_4"; then |
| 3117 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3118 |
++ fi |
| 3119 |
++ fi |
| 3120 |
+ ;; |
| 3121 |
+- *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 3122 |
+ esac |
| 3123 |
+ done |
| 3124 |
+ dependency_libs="$newdependency_libs" |
| 3125 |
+@@ -3975,6 +4005,10 @@ |
| 3126 |
+ case $host,$output,$installed,$module,$dlname in |
| 3127 |
+ *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
| 3128 |
+ esac |
| 3129 |
++ # Do not add duplicates |
| 3130 |
++ if test "$installed" = yes && test "$D"; then |
| 3131 |
++ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3132 |
++ fi |
| 3133 |
+ $echo > $output "\ |
| 3134 |
+ # $outputname - a libtool library file |
| 3135 |
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |
| 3136 |
|
| 3137 |
diff --git a/eclass/ELT-patches/portage/1.5.10 b/eclass/ELT-patches/portage/1.5.10 |
| 3138 |
new file mode 100644 |
| 3139 |
index 0000000..f33d906 |
| 3140 |
--- /dev/null |
| 3141 |
+++ b/eclass/ELT-patches/portage/1.5.10 |
| 3142 |
@@ -0,0 +1,77 @@ |
| 3143 |
+Note that if you update this patch, please update this one as well: |
| 3144 |
+ |
| 3145 |
+ eclass/ELT-patches/portage/1.4.1 |
| 3146 |
+ |
| 3147 |
+The file name can stay 1.4.1, as it will still apply to all versions. Only |
| 3148 |
+when a new version of libtool comes out that it do not apply to, then the |
| 3149 |
+name should be bumped, but the patch content should stay fairly the same. |
| 3150 |
+ |
| 3151 |
+--- ltmain.sh Wed Apr 3 01:19:37 2002 |
| 3152 |
++++ ltmain.sh Sun May 26 19:50:52 2002 |
| 3153 |
+@@ -3940,9 +3940,53 @@ |
| 3154 |
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
| 3155 |
+ exit 1 |
| 3156 |
+ fi |
| 3157 |
+- newdependency_libs="$newdependency_libs $libdir/$name" |
| 3158 |
++ if test "x$EGREP" = x ; then |
| 3159 |
++ EGREP=egrep |
| 3160 |
++ fi |
| 3161 |
++ # We do not want portage's install root ($D) present. Check only for |
| 3162 |
++ # this if the .la is being installed. |
| 3163 |
++ if test "$installed" = yes && test "$D"; then |
| 3164 |
++ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3165 |
++ else |
| 3166 |
++ mynewdependency_lib="$libdir/$name" |
| 3167 |
++ fi |
| 3168 |
++ # Do not add duplicates |
| 3169 |
++ if test "$mynewdependency_lib"; then |
| 3170 |
++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3171 |
++ if test -z "$my_little_ninja_foo_1"; then |
| 3172 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3173 |
++ fi |
| 3174 |
++ fi |
| 3175 |
++ ;; |
| 3176 |
++ *) |
| 3177 |
++ if test "$installed" = yes; then |
| 3178 |
++ # Rather use S=WORKDIR if our version of portage supports it. |
| 3179 |
++ # This is because some ebuild (gcc) do not use $S as buildroot. |
| 3180 |
++ if test "$WORKDIR"; then |
| 3181 |
++ S="$WORKDIR" |
| 3182 |
++ fi |
| 3183 |
++ # We do not want portage's build root ($S) present. |
| 3184 |
++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
| 3185 |
++ # We do not want portage's install root ($D) present. |
| 3186 |
++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
| 3187 |
++ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
| 3188 |
++ mynewdependency_lib="" |
| 3189 |
++ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
| 3190 |
++ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3191 |
++ else |
| 3192 |
++ mynewdependency_lib="$deplib" |
| 3193 |
++ fi |
| 3194 |
++ else |
| 3195 |
++ mynewdependency_lib="$deplib" |
| 3196 |
++ fi |
| 3197 |
++ # Do not add duplicates |
| 3198 |
++ if test "$mynewdependency_lib"; then |
| 3199 |
++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3200 |
++ if test -z "$my_little_ninja_foo_4"; then |
| 3201 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3202 |
++ fi |
| 3203 |
++ fi |
| 3204 |
+ ;; |
| 3205 |
+- *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 3206 |
+ esac |
| 3207 |
+ done |
| 3208 |
+ dependency_libs="$newdependency_libs" |
| 3209 |
+@@ -3975,6 +4005,10 @@ |
| 3210 |
+ case $host,$output,$installed,$module,$dlname in |
| 3211 |
+ *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
| 3212 |
+ esac |
| 3213 |
++ # Do not add duplicates |
| 3214 |
++ if test "$installed" = yes && test "$D"; then |
| 3215 |
++ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3216 |
++ fi |
| 3217 |
+ $echo > $output "\ |
| 3218 |
+ # $outputname - a libtool library file |
| 3219 |
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |
| 3220 |
|
| 3221 |
diff --git a/eclass/ELT-patches/portage/2.2 b/eclass/ELT-patches/portage/2.2 |
| 3222 |
new file mode 100644 |
| 3223 |
index 0000000..1f724e7 |
| 3224 |
--- /dev/null |
| 3225 |
+++ b/eclass/ELT-patches/portage/2.2 |
| 3226 |
@@ -0,0 +1,69 @@ |
| 3227 |
+--- ltmain.sh |
| 3228 |
++++ ltmain.sh |
| 3229 |
+@@ -7410,9 +7410,53 @@ |
| 3230 |
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 3231 |
+ test -z "$libdir" && \ |
| 3232 |
+ func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 3233 |
+- newdependency_libs="$newdependency_libs $libdir/$name" |
| 3234 |
++ if test "x$EGREP" = x ; then |
| 3235 |
++ EGREP=egrep |
| 3236 |
++ fi |
| 3237 |
++ # We do not want portage's install root ($D) present. Check only for |
| 3238 |
++ # this if the .la is being installed. |
| 3239 |
++ if test "$installed" = yes && test "$D"; then |
| 3240 |
++ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3241 |
++ else |
| 3242 |
++ mynewdependency_lib="$libdir/$name" |
| 3243 |
++ fi |
| 3244 |
++ # Do not add duplicates |
| 3245 |
++ if test "$mynewdependency_lib"; then |
| 3246 |
++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3247 |
++ if test -z "$my_little_ninja_foo_1"; then |
| 3248 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3249 |
++ fi |
| 3250 |
++ fi |
| 3251 |
++ ;; |
| 3252 |
++ *) |
| 3253 |
++ if test "$installed" = yes; then |
| 3254 |
++ # Rather use S=WORKDIR if our version of portage supports it. |
| 3255 |
++ # This is because some ebuild (gcc) do not use $S as buildroot. |
| 3256 |
++ if test "$WORKDIR"; then |
| 3257 |
++ S="$WORKDIR" |
| 3258 |
++ fi |
| 3259 |
++ # We do not want portage's build root ($S) present. |
| 3260 |
++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
| 3261 |
++ # We do not want portage's install root ($D) present. |
| 3262 |
++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
| 3263 |
++ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
| 3264 |
++ mynewdependency_lib="" |
| 3265 |
++ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
| 3266 |
++ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3267 |
++ else |
| 3268 |
++ mynewdependency_lib="$deplib" |
| 3269 |
++ fi |
| 3270 |
++ else |
| 3271 |
++ mynewdependency_lib="$deplib" |
| 3272 |
++ fi |
| 3273 |
++ # Do not add duplicates |
| 3274 |
++ if test "$mynewdependency_lib"; then |
| 3275 |
++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 3276 |
++ if test -z "$my_little_ninja_foo_4"; then |
| 3277 |
++ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 3278 |
++ fi |
| 3279 |
++ fi |
| 3280 |
+ ;; |
| 3281 |
+- *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 3282 |
+ esac |
| 3283 |
+ done |
| 3284 |
+ dependency_libs="$newdependency_libs" |
| 3285 |
+@@ -7476,6 +7520,10 @@ |
| 3286 |
+ case $host,$output,$installed,$module,$dlname in |
| 3287 |
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
| 3288 |
+ esac |
| 3289 |
++ # Do not add duplicates |
| 3290 |
++ if test "$installed" = yes && test "$D"; then |
| 3291 |
++ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 3292 |
++ fi |
| 3293 |
+ $ECHO > $output "\ |
| 3294 |
+ # $outputname - a libtool library file |
| 3295 |
+ # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION |
| 3296 |
|
| 3297 |
diff --git a/eclass/ELT-patches/relink-prog/1.3d b/eclass/ELT-patches/relink-prog/1.3d |
| 3298 |
new file mode 100644 |
| 3299 |
index 0000000..ccb6cb8 |
| 3300 |
--- /dev/null |
| 3301 |
+++ b/eclass/ELT-patches/relink-prog/1.3d |
| 3302 |
@@ -0,0 +1,24 @@ |
| 3303 |
+--- ltmain.sh |
| 3304 |
++++ ltmain.sh |
| 3305 |
+@@ -3203,6 +3203,12 @@ |
| 3306 |
+ add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 3307 |
+ ;; |
| 3308 |
+ esac |
| 3309 |
++ else |
| 3310 |
++ case $libdir in |
| 3311 |
++ [\\/]*) |
| 3312 |
++ add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir" |
| 3313 |
++ ;; |
| 3314 |
++ esac |
| 3315 |
+ fi |
| 3316 |
+ add="-l$name" |
| 3317 |
+ fi |
| 3318 |
+@@ -6630,7 +6636,7 @@ |
| 3319 |
+ esac |
| 3320 |
+ fi |
| 3321 |
+ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test |
| 3322 |
+- if test -n "$libdir" && test ! -f "$libfile"; then |
| 3323 |
++ if test -n "$libdir" && test ! -f "${D}$libfile"; then |
| 3324 |
+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 |
| 3325 |
+ finalize=no |
| 3326 |
+ fi |
| 3327 |
|
| 3328 |
diff --git a/eclass/ELT-patches/relink-prog/2.1b b/eclass/ELT-patches/relink-prog/2.1b |
| 3329 |
new file mode 100644 |
| 3330 |
index 0000000..71a0970 |
| 3331 |
--- /dev/null |
| 3332 |
+++ b/eclass/ELT-patches/relink-prog/2.1b |
| 3333 |
@@ -0,0 +1,24 @@ |
| 3334 |
+--- ltmain-v2.2.6.in 2009-06-22 15:33:27.000000000 +0200 |
| 3335 |
++++ ltmain-v2.2.6.in.new 2009-07-16 16:21:04.000000000 +0200 |
| 3336 |
+@@ -1742,7 +1742,7 @@ |
| 3337 |
+ func_source "$lib" |
| 3338 |
+ fi |
| 3339 |
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test |
| 3340 |
+- if test -n "$libdir" && test ! -f "$libfile"; then |
| 3341 |
++ if test -n "$libdir" && test ! -f "${D}$libfile"; then |
| 3342 |
+ func_warning "\`$lib' has not been installed in \`$libdir'" |
| 3343 |
+ finalize=no |
| 3344 |
+ fi |
| 3345 |
+@@ -5351,6 +5351,12 @@ |
| 3346 |
+ add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 3347 |
+ ;; |
| 3348 |
+ esac |
| 3349 |
++ else |
| 3350 |
++ case $libdir in |
| 3351 |
++ [\\/]*) |
| 3352 |
++ add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir" |
| 3353 |
++ ;; |
| 3354 |
++ esac |
| 3355 |
+ fi |
| 3356 |
+ add="-l$name" |
| 3357 |
+ fi |
| 3358 |
|
| 3359 |
diff --git a/eclass/ELT-patches/relink/1.4.0a b/eclass/ELT-patches/relink/1.4.0a |
| 3360 |
new file mode 100644 |
| 3361 |
index 0000000..382d760 |
| 3362 |
--- /dev/null |
| 3363 |
+++ b/eclass/ELT-patches/relink/1.4.0a |
| 3364 |
@@ -0,0 +1,99 @@ |
| 3365 |
+--- ltmain.sh Wed Oct 3 02:05:35 2001 |
| 3366 |
++++ ltmain.sh Wed Oct 3 05:16:14 2001 |
| 3367 |
+@@ -754,6 +754,7 @@ |
| 3368 |
+ linker_flags= |
| 3369 |
+ dllsearchpath= |
| 3370 |
+ lib_search_path=`pwd` |
| 3371 |
++ inst_prefix_dir= |
| 3372 |
+ |
| 3373 |
+ avoid_version=no |
| 3374 |
+ dlfiles= |
| 3375 |
+@@ -884,6 +885,11 @@ |
| 3376 |
+ prev= |
| 3377 |
+ continue |
| 3378 |
+ ;; |
| 3379 |
++ inst_prefix) |
| 3380 |
++ inst_prefix_dir="$arg" |
| 3381 |
++ prev= |
| 3382 |
++ continue |
| 3383 |
++ ;; |
| 3384 |
+ release) |
| 3385 |
+ release="-$arg" |
| 3386 |
+ prev= |
| 3387 |
+@@ -985,6 +991,11 @@ |
| 3388 |
+ continue |
| 3389 |
+ ;; |
| 3390 |
+ |
| 3391 |
++ -inst-prefix-dir) |
| 3392 |
++ prev=inst_prefix |
| 3393 |
++ continue |
| 3394 |
++ ;; |
| 3395 |
++ |
| 3396 |
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
| 3397 |
+ # so, if we see these flags be careful not to treat them like -L |
| 3398 |
+ -L[A-Z][A-Z]*:*) |
| 3399 |
+@@ -1866,6 +1877,7 @@ |
| 3400 |
+ |
| 3401 |
+ if test "$linkmode" = prog || test "$mode" = relink; then |
| 3402 |
+ add_shlibpath= |
| 3403 |
++ add_prefix_dir= |
| 3404 |
+ add_dir= |
| 3405 |
+ add= |
| 3406 |
+ # Finalize command for both is simple: just hardcode it. |
| 3407 |
+@@ -1886,10 +1898,22 @@ |
| 3408 |
+ add="-l$name" |
| 3409 |
+ fi |
| 3410 |
+ |
| 3411 |
++ if test -n "$inst_prefix_dir"; then |
| 3412 |
++ case "$libdir" in |
| 3413 |
++ [\\/]*) |
| 3414 |
++ add_prefix_dir="-L$inst_prefix_dir$libdir" |
| 3415 |
++ ;; |
| 3416 |
++ esac |
| 3417 |
++ fi |
| 3418 |
++ |
| 3419 |
++ # add_prefix_dir must be appended instead, otherwise it can |
| 3420 |
++ # possibly be overrided by any hardcoded -L/... path in deplibs |
| 3421 |
+ if test "$linkmode" = prog; then |
| 3422 |
++ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
| 3423 |
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 3424 |
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
| 3425 |
+ else |
| 3426 |
++ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
| 3427 |
+ test -n "$add_dir" && deplibs="$add_dir $deplibs" |
| 3428 |
+ test -n "$add" && deplibs="$add $deplibs" |
| 3429 |
+ fi |
| 3430 |
+@@ -3856,7 +3880,7 @@ |
| 3431 |
+ fi |
| 3432 |
+ done |
| 3433 |
+ # Quote the link command for shipping. |
| 3434 |
+- relink_command="($relink_command; cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
| 3435 |
++ relink_command="($relink_command; cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" |
| 3436 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 3437 |
+ |
| 3438 |
+ # Only create the output if not a dry run. |
| 3439 |
+@@ -4157,6 +4181,24 @@ |
| 3440 |
+ dir="$dir$objdir" |
| 3441 |
+ |
| 3442 |
+ if test -n "$relink_command"; then |
| 3443 |
++ # Determine the prefix the user has applied to our future dir. |
| 3444 |
++ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
| 3445 |
++ |
| 3446 |
++ # Don't allow the user to place us outside of our expected |
| 3447 |
++ # location b/c this prevents finding dependent libraries that |
| 3448 |
++ # are installed to the same prefix. |
| 3449 |
++ if test "$inst_prefix_dir" = "$destdir"; then |
| 3450 |
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 3451 |
++ exit 1 |
| 3452 |
++ fi |
| 3453 |
++ |
| 3454 |
++ if test -n "$inst_prefix_dir"; then |
| 3455 |
++ # Stick the inst_prefix_dir data into the link command. |
| 3456 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
| 3457 |
++ else |
| 3458 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
| 3459 |
++ fi |
| 3460 |
++ |
| 3461 |
+ $echo "$modename: warning: relinking \`$file'" 1>&2 |
| 3462 |
+ $show "$relink_command" |
| 3463 |
+ if $run eval "$relink_command"; then : |
| 3464 |
|
| 3465 |
diff --git a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 |
| 3466 |
new file mode 100644 |
| 3467 |
index 0000000..6bf45e5 |
| 3468 |
--- /dev/null |
| 3469 |
+++ b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 |
| 3470 |
@@ -0,0 +1,99 @@ |
| 3471 |
+--- ltmain.sh Wed Oct 3 02:05:35 2001 |
| 3472 |
++++ ltmain.sh Wed Oct 3 05:16:14 2001 |
| 3473 |
+@@ -754,6 +754,7 @@ |
| 3474 |
+ linker_flags= |
| 3475 |
+ dllsearchpath= |
| 3476 |
+ lib_search_path=`pwd` |
| 3477 |
++ inst_prefix_dir= |
| 3478 |
+ |
| 3479 |
+ avoid_version=no |
| 3480 |
+ dlfiles= |
| 3481 |
+@@ -884,6 +885,11 @@ |
| 3482 |
+ prev= |
| 3483 |
+ continue |
| 3484 |
+ ;; |
| 3485 |
++ inst_prefix) |
| 3486 |
++ inst_prefix_dir="$arg" |
| 3487 |
++ prev= |
| 3488 |
++ continue |
| 3489 |
++ ;; |
| 3490 |
+ release) |
| 3491 |
+ release="-$arg" |
| 3492 |
+ prev= |
| 3493 |
+@@ -985,6 +991,11 @@ |
| 3494 |
+ continue |
| 3495 |
+ ;; |
| 3496 |
+ |
| 3497 |
++ -inst-prefix-dir) |
| 3498 |
++ prev=inst_prefix |
| 3499 |
++ continue |
| 3500 |
++ ;; |
| 3501 |
++ |
| 3502 |
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
| 3503 |
+ # so, if we see these flags be careful not to treat them like -L |
| 3504 |
+ -L[A-Z][A-Z]*:*) |
| 3505 |
+@@ -1866,6 +1877,7 @@ |
| 3506 |
+ |
| 3507 |
+ if test "$linkmode" = prog || test "$mode" = relink; then |
| 3508 |
+ add_shlibpath= |
| 3509 |
++ add_prefix_dir= |
| 3510 |
+ add_dir= |
| 3511 |
+ add= |
| 3512 |
+ # Finalize command for both is simple: just hardcode it. |
| 3513 |
+@@ -1886,10 +1898,22 @@ |
| 3514 |
+ add="-l$name" |
| 3515 |
+ fi |
| 3516 |
+ |
| 3517 |
++ if test -n "$inst_prefix_dir"; then |
| 3518 |
++ case "$libdir" in |
| 3519 |
++ [\\/]*) |
| 3520 |
++ add_prefix_dir="-L$inst_prefix_dir$libdir" |
| 3521 |
++ ;; |
| 3522 |
++ esac |
| 3523 |
++ fi |
| 3524 |
++ |
| 3525 |
++ # add_prefix_dir must be appended instead, otherwise it can |
| 3526 |
++ # possibly be overrided by any hardcoded -L/... path in deplibs |
| 3527 |
+ if test "$linkmode" = prog; then |
| 3528 |
++ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
| 3529 |
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 3530 |
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
| 3531 |
+ else |
| 3532 |
++ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
| 3533 |
+ test -n "$add_dir" && deplibs="$add_dir $deplibs" |
| 3534 |
+ test -n "$add" && deplibs="$add $deplibs" |
| 3535 |
+ fi |
| 3536 |
+@@ -3856,7 +3880,7 @@ |
| 3537 |
+ for tag in $taglist; do |
| 3538 |
+ tagopts="$tagopts --tag $tag" |
| 3539 |
+ done |
| 3540 |
+- relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)" |
| 3541 |
++ relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)" |
| 3542 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 3543 |
+ |
| 3544 |
+ # Only create the output if not a dry run. |
| 3545 |
+@@ -4157,6 +4181,24 @@ |
| 3546 |
+ dir="$dir$objdir" |
| 3547 |
+ |
| 3548 |
+ if test -n "$relink_command"; then |
| 3549 |
++ # Determine the prefix the user has applied to our future dir. |
| 3550 |
++ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
| 3551 |
++ |
| 3552 |
++ # Don't allow the user to place us outside of our expected |
| 3553 |
++ # location b/c this prevents finding dependent libraries that |
| 3554 |
++ # are installed to the same prefix. |
| 3555 |
++ if test "$inst_prefix_dir" = "$destdir"; then |
| 3556 |
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 3557 |
++ exit 1 |
| 3558 |
++ fi |
| 3559 |
++ |
| 3560 |
++ if test -n "$inst_prefix_dir"; then |
| 3561 |
++ # Stick the inst_prefix_dir data into the link command. |
| 3562 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
| 3563 |
++ else |
| 3564 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
| 3565 |
++ fi |
| 3566 |
++ |
| 3567 |
+ $echo "$modename: warning: relinking \`$file'" 1>&2 |
| 3568 |
+ $show "$relink_command" |
| 3569 |
+ if $run eval "$relink_command"; then : |
| 3570 |
|
| 3571 |
diff --git a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 |
| 3572 |
new file mode 100644 |
| 3573 |
index 0000000..55103a4 |
| 3574 |
--- /dev/null |
| 3575 |
+++ b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 |
| 3576 |
@@ -0,0 +1,100 @@ |
| 3577 |
+--- ltmain.sh Wed Oct 3 02:05:35 2001 |
| 3578 |
++++ ltmain.sh Wed Oct 3 05:16:14 2001 |
| 3579 |
+@@ -754,6 +754,7 @@ |
| 3580 |
+ linker_flags= |
| 3581 |
+ dllsearchpath= |
| 3582 |
+ lib_search_path=`pwd` |
| 3583 |
++ inst_prefix_dir= |
| 3584 |
+ |
| 3585 |
+ avoid_version=no |
| 3586 |
+ dlfiles= |
| 3587 |
+@@ -884,6 +885,11 @@ |
| 3588 |
+ prev= |
| 3589 |
+ continue |
| 3590 |
+ ;; |
| 3591 |
++ inst_prefix) |
| 3592 |
++ inst_prefix_dir="$arg" |
| 3593 |
++ prev= |
| 3594 |
++ continue |
| 3595 |
++ ;; |
| 3596 |
+ release) |
| 3597 |
+ release="-$arg" |
| 3598 |
+ prev= |
| 3599 |
+@@ -985,6 +991,11 @@ |
| 3600 |
+ continue |
| 3601 |
+ ;; |
| 3602 |
+ |
| 3603 |
++ -inst-prefix-dir) |
| 3604 |
++ prev=inst_prefix |
| 3605 |
++ continue |
| 3606 |
++ ;; |
| 3607 |
++ |
| 3608 |
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
| 3609 |
+ # so, if we see these flags be careful not to treat them like -L |
| 3610 |
+ -L[A-Z][A-Z]*:*) |
| 3611 |
+@@ -1866,6 +1877,7 @@ |
| 3612 |
+ |
| 3613 |
+ if test "$linkmode" = prog || test "$mode" = relink; then |
| 3614 |
+ add_shlibpath= |
| 3615 |
++ add_prefix_dir= |
| 3616 |
+ add_dir= |
| 3617 |
+ add= |
| 3618 |
+ # Finalize command for both is simple: just hardcode it. |
| 3619 |
+@@ -1886,10 +1898,22 @@ |
| 3620 |
+ add="-l$name" |
| 3621 |
+ fi |
| 3622 |
+ |
| 3623 |
+- if test $linkmode = prog; then |
| 3624 |
++ if test -n "$inst_prefix_dir"; then |
| 3625 |
++ case "$libdir" in |
| 3626 |
++ [\\/]*) |
| 3627 |
++ add_prefix_dir="-L$inst_prefix_dir$libdir" |
| 3628 |
++ ;; |
| 3629 |
++ esac |
| 3630 |
++ fi |
| 3631 |
++ |
| 3632 |
++ # add_prefix_dir must be appended instead, otherwise it can |
| 3633 |
++ # possibly be overrided by any hardcoded -L/... path in deplibs |
| 3634 |
++ if test "$linkmode" = prog; then |
| 3635 |
++ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
| 3636 |
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 3637 |
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
| 3638 |
+ else |
| 3639 |
++ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
| 3640 |
+ test -n "$add_dir" && deplibs="$add_dir $deplibs" |
| 3641 |
+ test -n "$add" && deplibs="$add $deplibs" |
| 3642 |
+ fi |
| 3643 |
+@@ -3856,7 +3880,7 @@ |
| 3644 |
+ for tag in $taglist; do |
| 3645 |
+ tagopts="$tagopts --tag $tag" |
| 3646 |
+ done |
| 3647 |
+- relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)" |
| 3648 |
++ relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)" |
| 3649 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 3650 |
+ |
| 3651 |
+ # Only create the output if not a dry run. |
| 3652 |
+@@ -4157,6 +4181,24 @@ |
| 3653 |
+ dir="$dir$objdir" |
| 3654 |
+ |
| 3655 |
+ if test -n "$relink_command"; then |
| 3656 |
++ # Determine the prefix the user has applied to our future dir. |
| 3657 |
++ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
| 3658 |
++ |
| 3659 |
++ # Don't allow the user to place us outside of our expected |
| 3660 |
++ # location b/c this prevents finding dependent libraries that |
| 3661 |
++ # are installed to the same prefix. |
| 3662 |
++ if test "$inst_prefix_dir" = "$destdir"; then |
| 3663 |
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 3664 |
++ exit 1 |
| 3665 |
++ fi |
| 3666 |
++ |
| 3667 |
++ if test -n "$inst_prefix_dir"; then |
| 3668 |
++ # Stick the inst_prefix_dir data into the link command. |
| 3669 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
| 3670 |
++ else |
| 3671 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
| 3672 |
++ fi |
| 3673 |
++ |
| 3674 |
+ $echo "$modename: warning: relinking \`$file'" 1>&2 |
| 3675 |
+ $show "$relink_command" |
| 3676 |
+ if $run eval "$relink_command"; then : |
| 3677 |
|
| 3678 |
diff --git a/eclass/ELT-patches/relink/1.4.1 b/eclass/ELT-patches/relink/1.4.1 |
| 3679 |
new file mode 100644 |
| 3680 |
index 0000000..f34863f |
| 3681 |
--- /dev/null |
| 3682 |
+++ b/eclass/ELT-patches/relink/1.4.1 |
| 3683 |
@@ -0,0 +1,124 @@ |
| 3684 |
+--- ltmain.sh Sun Aug 12 18:08:05 2001 |
| 3685 |
++++ ltmain.sh Tue Aug 28 18:55:13 2001 |
| 3686 |
+@@ -827,6 +827,7 @@ |
| 3687 |
+ linker_flags= |
| 3688 |
+ dllsearchpath= |
| 3689 |
+ lib_search_path=`pwd` |
| 3690 |
++ inst_prefix_dir= |
| 3691 |
+ |
| 3692 |
+ avoid_version=no |
| 3693 |
+ dlfiles= |
| 3694 |
+@@ -959,6 +960,11 @@ |
| 3695 |
+ prev= |
| 3696 |
+ continue |
| 3697 |
+ ;; |
| 3698 |
++ inst_prefix) |
| 3699 |
++ inst_prefix_dir="$arg" |
| 3700 |
++ prev= |
| 3701 |
++ continue |
| 3702 |
++ ;; |
| 3703 |
+ release) |
| 3704 |
+ release="-$arg" |
| 3705 |
+ prev= |
| 3706 |
+@@ -1167,6 +1173,11 @@ |
| 3707 |
+ continue |
| 3708 |
+ ;; |
| 3709 |
+ |
| 3710 |
++ -inst-prefix-dir) |
| 3711 |
++ prev=inst_prefix |
| 3712 |
++ continue |
| 3713 |
++ ;; |
| 3714 |
++ |
| 3715 |
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
| 3716 |
+ # so, if we see these flags be careful not to treat them like -L |
| 3717 |
+ -L[A-Z][A-Z]*:*) |
| 3718 |
+@@ -2231,7 +2242,16 @@ |
| 3719 |
+ if test "$hardcode_direct" = yes; then |
| 3720 |
+ add="$libdir/$linklib" |
| 3721 |
+ elif test "$hardcode_minus_L" = yes; then |
| 3722 |
+- add_dir="-L$libdir" |
| 3723 |
++ # Try looking first in the location we're being installed to. |
| 3724 |
++ add_dir= |
| 3725 |
++ if test -n "$inst_prefix_dir"; then |
| 3726 |
++ case "$libdir" in |
| 3727 |
++ [\\/]*) |
| 3728 |
++ add_dir="-L$inst_prefix_dir$libdir" |
| 3729 |
++ ;; |
| 3730 |
++ esac |
| 3731 |
++ fi |
| 3732 |
++ add_dir="$add_dir -L$libdir" |
| 3733 |
+ add="-l$name" |
| 3734 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 3735 |
+ case :$finalize_shlibpath: in |
| 3736 |
+@@ -2241,7 +2261,16 @@ |
| 3737 |
+ add="-l$name" |
| 3738 |
+ else |
| 3739 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 3740 |
+- add_dir="-L$libdir" |
| 3741 |
++ # Try looking first in the location we're being installed to. |
| 3742 |
++ add_dir= |
| 3743 |
++ if test -n "$inst_prefix_dir"; then |
| 3744 |
++ case "$libdir" in |
| 3745 |
++ [\\/]*) |
| 3746 |
++ add_dir="-L$inst_prefix_dir$libdir" |
| 3747 |
++ ;; |
| 3748 |
++ esac |
| 3749 |
++ fi |
| 3750 |
++ add_dir="$add_dir -L$libdir" |
| 3751 |
+ add="-l$name" |
| 3752 |
+ fi |
| 3753 |
+ |
| 3754 |
+@@ -4321,7 +4350,7 @@ |
| 3755 |
+ fi |
| 3756 |
+ done |
| 3757 |
+ # Quote the link command for shipping. |
| 3758 |
+- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" |
| 3759 |
++ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@" |
| 3760 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 3761 |
+ |
| 3762 |
+ # Only create the output if not a dry run. |
| 3763 |
+@@ -4622,12 +4651,30 @@ |
| 3764 |
+ dir="$dir$objdir" |
| 3765 |
+ |
| 3766 |
+ if test -n "$relink_command"; then |
| 3767 |
++ # Determine the prefix the user has applied to our future dir. |
| 3768 |
++ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
| 3769 |
++ |
| 3770 |
++ # Don't allow the user to place us outside of our expected |
| 3771 |
++ # location b/c this prevents finding dependent libraries that |
| 3772 |
++ # are installed to the same prefix. |
| 3773 |
++ if test "$inst_prefix_dir" = "$destdir"; then |
| 3774 |
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 3775 |
++ exit 1 |
| 3776 |
++ fi |
| 3777 |
++ |
| 3778 |
++ if test -n "$inst_prefix_dir"; then |
| 3779 |
++ # Stick the inst_prefix_dir data into the link command. |
| 3780 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
| 3781 |
++ else |
| 3782 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
| 3783 |
++ fi |
| 3784 |
++ |
| 3785 |
+ $echo "$modename: warning: relinking \`$file'" 1>&2 |
| 3786 |
+ $show "$relink_command" |
| 3787 |
+ if $run eval "$relink_command"; then : |
| 3788 |
+ else |
| 3789 |
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 |
| 3790 |
+- continue |
| 3791 |
++ exit 1 |
| 3792 |
+ fi |
| 3793 |
+ fi |
| 3794 |
+ |
| 3795 |
+@@ -4782,7 +4829,11 @@ |
| 3796 |
+ if test "$finalize" = yes && test -z "$run"; then |
| 3797 |
+ tmpdir="/tmp" |
| 3798 |
+ test -n "$TMPDIR" && tmpdir="$TMPDIR" |
| 3799 |
+- tmpdir="$tmpdir/libtool-$$" |
| 3800 |
++ tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` |
| 3801 |
++ if test $? = 0 ; then : |
| 3802 |
++ else |
| 3803 |
++ tmpdir="$tmpdir/libtool-$$" |
| 3804 |
++ fi |
| 3805 |
+ if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : |
| 3806 |
+ else |
| 3807 |
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |
| 3808 |
|
| 3809 |
diff --git a/eclass/ELT-patches/relink/1.4.2 b/eclass/ELT-patches/relink/1.4.2 |
| 3810 |
new file mode 100644 |
| 3811 |
index 0000000..17a630b |
| 3812 |
--- /dev/null |
| 3813 |
+++ b/eclass/ELT-patches/relink/1.4.2 |
| 3814 |
@@ -0,0 +1,99 @@ |
| 3815 |
+--- ltmain.sh Wed Oct 3 02:05:35 2001 |
| 3816 |
++++ ltmain.sh Wed Oct 3 05:16:14 2001 |
| 3817 |
+@@ -754,6 +754,7 @@ |
| 3818 |
+ linker_flags= |
| 3819 |
+ dllsearchpath= |
| 3820 |
+ lib_search_path=`pwd` |
| 3821 |
++ inst_prefix_dir= |
| 3822 |
+ |
| 3823 |
+ avoid_version=no |
| 3824 |
+ dlfiles= |
| 3825 |
+@@ -884,6 +885,11 @@ |
| 3826 |
+ prev= |
| 3827 |
+ continue |
| 3828 |
+ ;; |
| 3829 |
++ inst_prefix) |
| 3830 |
++ inst_prefix_dir="$arg" |
| 3831 |
++ prev= |
| 3832 |
++ continue |
| 3833 |
++ ;; |
| 3834 |
+ release) |
| 3835 |
+ release="-$arg" |
| 3836 |
+ prev= |
| 3837 |
+@@ -985,6 +991,11 @@ |
| 3838 |
+ continue |
| 3839 |
+ ;; |
| 3840 |
+ |
| 3841 |
++ -inst-prefix-dir) |
| 3842 |
++ prev=inst_prefix |
| 3843 |
++ continue |
| 3844 |
++ ;; |
| 3845 |
++ |
| 3846 |
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
| 3847 |
+ # so, if we see these flags be careful not to treat them like -L |
| 3848 |
+ -L[A-Z][A-Z]*:*) |
| 3849 |
+@@ -1866,6 +1877,7 @@ |
| 3850 |
+ |
| 3851 |
+ if test "$linkmode" = prog || test "$mode" = relink; then |
| 3852 |
+ add_shlibpath= |
| 3853 |
++ add_prefix_dir= |
| 3854 |
+ add_dir= |
| 3855 |
+ add= |
| 3856 |
+ # Finalize command for both is simple: just hardcode it. |
| 3857 |
+@@ -1886,10 +1898,22 @@ |
| 3858 |
+ add="-l$name" |
| 3859 |
+ fi |
| 3860 |
+ |
| 3861 |
++ if test -n "$inst_prefix_dir"; then |
| 3862 |
++ case "$libdir" in |
| 3863 |
++ [\\/]*) |
| 3864 |
++ add_prefix_dir="-L$inst_prefix_dir$libdir" |
| 3865 |
++ ;; |
| 3866 |
++ esac |
| 3867 |
++ fi |
| 3868 |
++ |
| 3869 |
++ # add_prefix_dir must be appended instead, otherwise it can |
| 3870 |
++ # possibly be overrided by any hardcoded -L/... path in deplibs |
| 3871 |
+ if test "$linkmode" = prog; then |
| 3872 |
++ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
| 3873 |
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 3874 |
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
| 3875 |
+ else |
| 3876 |
++ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
| 3877 |
+ test -n "$add_dir" && deplibs="$add_dir $deplibs" |
| 3878 |
+ test -n "$add" && deplibs="$add $deplibs" |
| 3879 |
+ fi |
| 3880 |
+@@ -3856,7 +3880,7 @@ |
| 3881 |
+ fi |
| 3882 |
+ done |
| 3883 |
+ # Quote the link command for shipping. |
| 3884 |
+- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
| 3885 |
++ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" |
| 3886 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 3887 |
+ |
| 3888 |
+ # Only create the output if not a dry run. |
| 3889 |
+@@ -4157,6 +4181,24 @@ |
| 3890 |
+ dir="$dir$objdir" |
| 3891 |
+ |
| 3892 |
+ if test -n "$relink_command"; then |
| 3893 |
++ # Determine the prefix the user has applied to our future dir. |
| 3894 |
++ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
| 3895 |
++ |
| 3896 |
++ # Don't allow the user to place us outside of our expected |
| 3897 |
++ # location b/c this prevents finding dependent libraries that |
| 3898 |
++ # are installed to the same prefix. |
| 3899 |
++ if test "$inst_prefix_dir" = "$destdir"; then |
| 3900 |
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 3901 |
++ exit 1 |
| 3902 |
++ fi |
| 3903 |
++ |
| 3904 |
++ if test -n "$inst_prefix_dir"; then |
| 3905 |
++ # Stick the inst_prefix_dir data into the link command. |
| 3906 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
| 3907 |
++ else |
| 3908 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
| 3909 |
++ fi |
| 3910 |
++ |
| 3911 |
+ $echo "$modename: warning: relinking \`$file'" 1>&2 |
| 3912 |
+ $show "$relink_command" |
| 3913 |
+ if $run eval "$relink_command"; then : |
| 3914 |
|
| 3915 |
diff --git a/eclass/ELT-patches/relink/1.4.3 b/eclass/ELT-patches/relink/1.4.3 |
| 3916 |
new file mode 100644 |
| 3917 |
index 0000000..3ed5fe3 |
| 3918 |
--- /dev/null |
| 3919 |
+++ b/eclass/ELT-patches/relink/1.4.3 |
| 3920 |
@@ -0,0 +1,111 @@ |
| 3921 |
+--- ltmain.sh Mon Feb 4 15:12:15 2002 |
| 3922 |
++++ ltmain.sh Mon Feb 4 15:12:15 2002 |
| 3923 |
+@@ -745,6 +745,7 @@ |
| 3924 |
+ linker_flags= |
| 3925 |
+ dllsearchpath= |
| 3926 |
+ lib_search_path=`pwd` |
| 3927 |
++ inst_prefix_dir= |
| 3928 |
+ |
| 3929 |
+ avoid_version=no |
| 3930 |
+ dlfiles= |
| 3931 |
+@@ -875,6 +876,11 @@ |
| 3932 |
+ prev= |
| 3933 |
+ continue |
| 3934 |
+ ;; |
| 3935 |
++ inst_prefix) |
| 3936 |
++ inst_prefix_dir="$arg" |
| 3937 |
++ prev= |
| 3938 |
++ continue |
| 3939 |
++ ;; |
| 3940 |
+ release) |
| 3941 |
+ release="-$arg" |
| 3942 |
+ prev= |
| 3943 |
+@@ -976,6 +982,11 @@ |
| 3944 |
+ continue |
| 3945 |
+ ;; |
| 3946 |
+ |
| 3947 |
++ -inst-prefix-dir) |
| 3948 |
++ prev=inst_prefix |
| 3949 |
++ continue |
| 3950 |
++ ;; |
| 3951 |
++ |
| 3952 |
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
| 3953 |
+ # so, if we see these flags be careful not to treat them like -L |
| 3954 |
+ -L[A-Z][A-Z]*:*) |
| 3955 |
+@@ -1851,7 +1862,16 @@ |
| 3956 |
+ if test "$hardcode_direct" = yes; then |
| 3957 |
+ add="$libdir/$linklib" |
| 3958 |
+ elif test "$hardcode_minus_L" = yes; then |
| 3959 |
+- add_dir="-L$libdir" |
| 3960 |
++ # Try looking first in the location we're being installed to. |
| 3961 |
++ add_dir= |
| 3962 |
++ if test -n "$inst_prefix_dir"; then |
| 3963 |
++ case "$libdir" in |
| 3964 |
++ [\\/]*) |
| 3965 |
++ add_dir="-L$inst_prefix_dir$libdir" |
| 3966 |
++ ;; |
| 3967 |
++ esac |
| 3968 |
++ fi |
| 3969 |
++ add_dir="$add_dir -L$libdir" |
| 3970 |
+ add="-l$name" |
| 3971 |
+ elif test "$hardcode_shlibpath_var" = yes; then |
| 3972 |
+ case :$finalize_shlibpath: in |
| 3973 |
+@@ -1861,7 +1881,16 @@ |
| 3974 |
+ add="-l$name" |
| 3975 |
+ else |
| 3976 |
+ # We cannot seem to hardcode it, guess we'll fake it. |
| 3977 |
+- add_dir="-L$libdir" |
| 3978 |
++ # Try looking first in the location we're being installed to. |
| 3979 |
++ add_dir= |
| 3980 |
++ if test -n "$inst_prefix_dir"; then |
| 3981 |
++ case "$libdir" in |
| 3982 |
++ [\\/]*) |
| 3983 |
++ add_dir="-L$inst_prefix_dir$libdir" |
| 3984 |
++ ;; |
| 3985 |
++ esac |
| 3986 |
++ fi |
| 3987 |
++ add_dir="$add_dir -L$libdir" |
| 3988 |
+ add="-l$name" |
| 3989 |
+ fi |
| 3990 |
+ |
| 3991 |
+@@ -3823,7 +3852,7 @@ |
| 3992 |
+ fi |
| 3993 |
+ done |
| 3994 |
+ # Quote the link command for shipping. |
| 3995 |
+- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
| 3996 |
++ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" |
| 3997 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 3998 |
+ |
| 3999 |
+ # Only create the output if not a dry run. |
| 4000 |
+@@ -4124,12 +4153,30 @@ |
| 4001 |
+ dir="$dir$objdir" |
| 4002 |
+ |
| 4003 |
+ if test -n "$relink_command"; then |
| 4004 |
++ # Determine the prefix the user has applied to our future dir. |
| 4005 |
++ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
| 4006 |
++ |
| 4007 |
++ # Don't allow the user to place us outside of our expected |
| 4008 |
++ # location b/c this prevents finding dependent libraries that |
| 4009 |
++ # are installed to the same prefix. |
| 4010 |
++ if test "$inst_prefix_dir" = "$destdir"; then |
| 4011 |
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 4012 |
++ exit 1 |
| 4013 |
++ fi |
| 4014 |
++ |
| 4015 |
++ if test -n "$inst_prefix_dir"; then |
| 4016 |
++ # Stick the inst_prefix_dir data into the link command. |
| 4017 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
| 4018 |
++ else |
| 4019 |
++ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
| 4020 |
++ fi |
| 4021 |
++ |
| 4022 |
+ $echo "$modename: warning: relinking \`$file'" 1>&2 |
| 4023 |
+ $show "$relink_command" |
| 4024 |
+ if $run eval "$relink_command"; then : |
| 4025 |
+ else |
| 4026 |
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 |
| 4027 |
+- continue |
| 4028 |
++ exit 1 |
| 4029 |
+ fi |
| 4030 |
+ fi |
| 4031 |
+ |
| 4032 |
|
| 4033 |
diff --git a/eclass/ELT-patches/rem-int-dep/1.3.5 b/eclass/ELT-patches/rem-int-dep/1.3.5 |
| 4034 |
new file mode 100644 |
| 4035 |
index 0000000..4302623 |
| 4036 |
--- /dev/null |
| 4037 |
+++ b/eclass/ELT-patches/rem-int-dep/1.3.5 |
| 4038 |
@@ -0,0 +1,11 @@ |
| 4039 |
+--- ltmain.sh 2002-11-01 19:56:50.000000000 -0600 |
| 4040 |
++++ ltmain.sh 2002-11-01 19:57:03.000000000 -0600 |
| 4041 |
+@@ -4551,6 +4551,8 @@ |
| 4042 |
+ if test "$installed" = yes && test "$D"; then |
| 4043 |
+ install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`" |
| 4044 |
+ fi |
| 4045 |
++ # Removing @REM_INT_DEP@ from dependency_libs in .la |
| 4046 |
++ dependency_libs=`echo $dependency_libs | $Xsed -e 's%\([^ ]*lib@REM_INT_DEP@\.\(so\|la\|a\)\)\|\(-l@REM_INT_DEP@\)%%g'` |
| 4047 |
+ \$echo > \$output "\\ |
| 4048 |
+ # \$outputname - a libtool library file |
| 4049 |
+ # Generated by \$PROGRAM - GNU \$PACKAGE \$VERSION\$TIMESTAMP |
| 4050 |
|
| 4051 |
diff --git a/eclass/ELT-patches/sed/1.3.4 b/eclass/ELT-patches/sed/1.3.4 |
| 4052 |
new file mode 100644 |
| 4053 |
index 0000000..c88ff72 |
| 4054 |
--- /dev/null |
| 4055 |
+++ b/eclass/ELT-patches/sed/1.3.4 |
| 4056 |
@@ -0,0 +1,14 @@ |
| 4057 |
+--- ltmain.sh 2005-05-13 11:48:24.000000000 +0200 |
| 4058 |
++++ ltmain.sh 2005-05-13 11:48:42.000000000 +0200 |
| 4059 |
+@@ -47,6 +47,11 @@ |
| 4060 |
+ exit 0 |
| 4061 |
+ fi |
| 4062 |
+ |
| 4063 |
++# define variables for historic ltconfig's generated by Libtool 1.3 |
| 4064 |
++test -z "$SED" && SED=sed |
| 4065 |
++test -z "$EGREP" && EGREP=egrep |
| 4066 |
++test -z "$LTCC" && LTCC=${CC-gcc} |
| 4067 |
++ |
| 4068 |
+ # The name of this program. |
| 4069 |
+ progname=`$echo "$0" | sed 's%^.*/%%'` |
| 4070 |
+ modename="$progname" |
| 4071 |
|
| 4072 |
diff --git a/eclass/ELT-patches/sed/1.4.0 b/eclass/ELT-patches/sed/1.4.0 |
| 4073 |
new file mode 100644 |
| 4074 |
index 0000000..9c51ac2 |
| 4075 |
--- /dev/null |
| 4076 |
+++ b/eclass/ELT-patches/sed/1.4.0 |
| 4077 |
@@ -0,0 +1,14 @@ |
| 4078 |
+--- ltmain.sh 2003-02-13 14:54:24.000000000 +0100 |
| 4079 |
++++ ltmain.sh 2003-02-13 15:24:49.000000000 +0100 |
| 4080 |
+@@ -48,6 +48,11 @@ EOF |
| 4081 |
+ exit 0 |
| 4082 |
+ fi |
| 4083 |
+ |
| 4084 |
++# define variables for historic ltconfig's generated by Libtool 1.3 |
| 4085 |
++test -z "$SED" && SED=sed |
| 4086 |
++test -z "$EGREP" && EGREP=egrep |
| 4087 |
++test -z "$LTCC" && LTCC=${CC-gcc} |
| 4088 |
++ |
| 4089 |
+ # The name of this program. |
| 4090 |
+ progname=`$echo "$0" | ${SED} 's%^.*/%%'` |
| 4091 |
+ modename="$progname" |
| 4092 |
|
| 4093 |
diff --git a/eclass/ELT-patches/sed/1.5.6 b/eclass/ELT-patches/sed/1.5.6 |
| 4094 |
new file mode 100644 |
| 4095 |
index 0000000..5efd531 |
| 4096 |
--- /dev/null |
| 4097 |
+++ b/eclass/ELT-patches/sed/1.5.6 |
| 4098 |
@@ -0,0 +1,16 @@ |
| 4099 |
+--- ltmain.sh 2005-04-16 16:50:02.000000000 +0200 |
| 4100 |
++++ ltmain.sh 2005-04-16 16:46:46.000000000 +0200 |
| 4101 |
+@@ -39,6 +39,13 @@ |
| 4102 |
+ if [ "x$SED" = x ] ; then |
| 4103 |
+ SED=sed |
| 4104 |
+ fi |
| 4105 |
++# Same for EGREP, and just to be sure, do LTCC as well |
| 4106 |
++if test "x$EGREP" = x ; then |
| 4107 |
++ EGREP=egrep |
| 4108 |
++fi |
| 4109 |
++if test "x$LTCC" = x ; then |
| 4110 |
++ LTCC=${CC-gcc} |
| 4111 |
++fi |
| 4112 |
+ |
| 4113 |
+ # The name of this program: |
| 4114 |
+ progname=`echo "$progpath" | $SED $basename` |
| 4115 |
|
| 4116 |
diff --git a/eclass/ELT-patches/sol2-conf/2.4.2 b/eclass/ELT-patches/sol2-conf/2.4.2 |
| 4117 |
new file mode 100644 |
| 4118 |
index 0000000..a57f22c |
| 4119 |
--- /dev/null |
| 4120 |
+++ b/eclass/ELT-patches/sol2-conf/2.4.2 |
| 4121 |
@@ -0,0 +1,14 @@ |
| 4122 |
+Unbreak x86_64-pc-solaris2.1[01], it IS 64-bits too. Without this, |
| 4123 |
+libtool thinks the linker is called ld_sol2. |
| 4124 |
+ |
| 4125 |
+--- configure |
| 4126 |
++++ configure |
| 4127 |
+@@ -1383,7 +1383,7 @@ |
| 4128 |
+ case $lt_cv_prog_gnu_ld in |
| 4129 |
+ yes*) |
| 4130 |
+ case $host in |
| 4131 |
+- i?86-*-solaris*) |
| 4132 |
++ i?86-*-solaris*|x86_64-*-solaris*) |
| 4133 |
+ LD="${LD-ld} -m elf_x86_64" |
| 4134 |
+ ;; |
| 4135 |
+ sparc*-*-solaris*) |
| 4136 |
|
| 4137 |
diff --git a/eclass/ELT-patches/sol2-ltmain/2.4.2 b/eclass/ELT-patches/sol2-ltmain/2.4.2 |
| 4138 |
new file mode 100644 |
| 4139 |
index 0000000..ad35ed8 |
| 4140 |
--- /dev/null |
| 4141 |
+++ b/eclass/ELT-patches/sol2-ltmain/2.4.2 |
| 4142 |
@@ -0,0 +1,11 @@ |
| 4143 |
+--- libltdl/config/ltmain.sh |
| 4144 |
++++ libltdl/config/ltmain.sh |
| 4145 |
+@@ -1180,7 +1180,7 @@ |
| 4146 |
+ test "$opt_debug" = : || func_append preserve_args " --debug" |
| 4147 |
+ |
| 4148 |
+ case $host in |
| 4149 |
+- *cygwin* | *mingw* | *pw32* | *cegcc*) |
| 4150 |
++ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*) |
| 4151 |
+ # don't eliminate duplications in $postdeps and $predeps |
| 4152 |
+ opt_duplicate_compiler_generated_deps=: |
| 4153 |
+ ;; |
| 4154 |
|
| 4155 |
diff --git a/eclass/ELT-patches/sys-lib-dlsearch/2.4 b/eclass/ELT-patches/sys-lib-dlsearch/2.4 |
| 4156 |
new file mode 100644 |
| 4157 |
index 0000000..89eb699 |
| 4158 |
--- /dev/null |
| 4159 |
+++ b/eclass/ELT-patches/sys-lib-dlsearch/2.4 |
| 4160 |
@@ -0,0 +1,21 @@ |
| 4161 |
+the linux target parses /etc/ld.so.conf to see what paths are |
| 4162 |
+searched at runtime, and hardcodes /lib /usr/lib as a fallback. |
| 4163 |
+this works poorly when cross-compiling, so tweak the behavior: |
| 4164 |
+ - search $SYSROOT/etc/ld.so.conf |
| 4165 |
+ - default to Gentoo's notion of the active multilib |
| 4166 |
+ |
| 4167 |
+--- a/configure |
| 4168 |
++++ b/configure |
| 4169 |
+@@ -10405,9 +10405,9 @@ |
| 4170 |
+ hardcode_into_libs=yes |
| 4171 |
+ |
| 4172 |
+ # Append ld.so.conf contents to the search path |
| 4173 |
+- if test -f /etc/ld.so.conf; then |
| 4174 |
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
| 4175 |
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
| 4176 |
++ if test -f "$SYSROOT"/etc/ld.so.conf; then |
| 4177 |
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < "$SYSROOT"/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
| 4178 |
++ sys_lib_dlsearch_path_spec="/@GENTOO_LIBDIR@ /usr/@GENTOO_LIBDIR@ $lt_ld_extra" |
| 4179 |
+ fi |
| 4180 |
+ |
| 4181 |
+ # We used to test for /lib/ld.so.1 and disable shared libraries on |
| 4182 |
|
| 4183 |
diff --git a/eclass/ELT-patches/target-nm/2.4.2 b/eclass/ELT-patches/target-nm/2.4.2 |
| 4184 |
new file mode 100644 |
| 4185 |
index 0000000..1f22220 |
| 4186 |
--- /dev/null |
| 4187 |
+++ b/eclass/ELT-patches/target-nm/2.4.2 |
| 4188 |
@@ -0,0 +1,45 @@ |
| 4189 |
+https://bugs.gentoo.org/465558 |
| 4190 |
+ |
| 4191 |
+From a4629ebff263dcb2e05feb9e41df649ea5ce3f78 Mon Sep 17 00:00:00 2001 |
| 4192 |
+From: Peter Rosin <peda@×××××××××××.se> |
| 4193 |
+Date: Sun, 28 Apr 2013 09:16:56 +0200 |
| 4194 |
+Subject: [PATCH] libtool: break all the way out when a good nm is found |
| 4195 |
+ |
| 4196 |
+The current code tries to locate a compatible nm tool. It starts with |
| 4197 |
+a prefixed nm tool (great!) and includes a plain nm too (that's fine). |
| 4198 |
+The problem is that the code searches for the prefixed nm before the |
| 4199 |
+plain nm (normally fine), but doesn't break once it has found a valid |
| 4200 |
+match, and the plain nm ends up the winner. |
| 4201 |
+ |
| 4202 |
+Report and analysis by Mike Frysinger. |
| 4203 |
+ |
| 4204 |
+* m4/libtool.m4 (LT_PATH_NM): Break all the way out on a good match. |
| 4205 |
+ |
| 4206 |
+Signed-off-by: Peter Rosin <peda@×××××××××××.se> |
| 4207 |
+--- |
| 4208 |
+ m4/libtool.m4 | 4 ++-- |
| 4209 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 4210 |
+ |
| 4211 |
+diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
| 4212 |
+index 3f50b0c..d7013c5 100644 |
| 4213 |
+--- a/m4/libtool.m4 |
| 4214 |
++++ b/m4/libtool.m4 |
| 4215 |
+@@ -3397,13 +3397,13 @@ else |
| 4216 |
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
| 4217 |
+ */dev/null* | *'Invalid file or object type'*) |
| 4218 |
+ lt_cv_path_NM="$tmp_nm -B" |
| 4219 |
+- break |
| 4220 |
++ break 2 |
| 4221 |
+ ;; |
| 4222 |
+ *) |
| 4223 |
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
| 4224 |
+ */dev/null*) |
| 4225 |
+ lt_cv_path_NM="$tmp_nm -p" |
| 4226 |
+- break |
| 4227 |
++ break 2 |
| 4228 |
+ ;; |
| 4229 |
+ *) |
| 4230 |
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
| 4231 |
+-- |
| 4232 |
+1.8.2.1 |
| 4233 |
+ |
| 4234 |
|
| 4235 |
diff --git a/eclass/ELT-patches/test/1.4.0 b/eclass/ELT-patches/test/1.4.0 |
| 4236 |
new file mode 100644 |
| 4237 |
index 0000000..d6f442f |
| 4238 |
--- /dev/null |
| 4239 |
+++ b/eclass/ELT-patches/test/1.4.0 |
| 4240 |
@@ -0,0 +1,291 @@ |
| 4241 |
+--- ltmain.sh Tue May 29 19:16:03 2001 |
| 4242 |
++++ ltmain.sh Tue May 29 21:26:50 2001 |
| 4243 |
+@@ -459,7 +459,7 @@ |
| 4244 |
+ pic_mode=default |
| 4245 |
+ ;; |
| 4246 |
+ esac |
| 4247 |
+- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then |
| 4248 |
++ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then |
| 4249 |
+ # non-PIC code in shared libraries is not supported |
| 4250 |
+ pic_mode=default |
| 4251 |
+ fi |
| 4252 |
+@@ -1343,7 +1343,7 @@ |
| 4253 |
+ ;; |
| 4254 |
+ esac |
| 4255 |
+ for pass in $passes; do |
| 4256 |
+- if test $linkmode = prog; then |
| 4257 |
++ if test "$linkmode" = prog; then |
| 4258 |
+ # Determine which files to process |
| 4259 |
+ case $pass in |
| 4260 |
+ dlopen) |
| 4261 |
+@@ -1360,11 +1360,11 @@ |
| 4262 |
+ found=no |
| 4263 |
+ case $deplib in |
| 4264 |
+ -l*) |
| 4265 |
+- if test $linkmode = oldlib && test $linkmode = obj; then |
| 4266 |
++ if test "$linkmode" = oldlib && test "$linkmode" = obj; then |
| 4267 |
+ $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 |
| 4268 |
+ continue |
| 4269 |
+ fi |
| 4270 |
+- if test $pass = conv; then |
| 4271 |
++ if test "$pass" = conv; then |
| 4272 |
+ deplibs="$deplib $deplibs" |
| 4273 |
+ continue |
| 4274 |
+ fi |
| 4275 |
+@@ -1384,7 +1384,7 @@ |
| 4276 |
+ finalize_deplibs="$deplib $finalize_deplibs" |
| 4277 |
+ else |
| 4278 |
+ deplibs="$deplib $deplibs" |
| 4279 |
+- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" |
| 4280 |
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" |
| 4281 |
+ fi |
| 4282 |
+ continue |
| 4283 |
+ fi |
| 4284 |
+@@ -1393,16 +1393,16 @@ |
| 4285 |
+ case $linkmode in |
| 4286 |
+ lib) |
| 4287 |
+ deplibs="$deplib $deplibs" |
| 4288 |
+- test $pass = conv && continue |
| 4289 |
++ test "$pass" = conv && continue |
| 4290 |
+ newdependency_libs="$deplib $newdependency_libs" |
| 4291 |
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
| 4292 |
+ ;; |
| 4293 |
+ prog) |
| 4294 |
+- if test $pass = conv; then |
| 4295 |
++ if test "$pass" = conv; then |
| 4296 |
+ deplibs="$deplib $deplibs" |
| 4297 |
+ continue |
| 4298 |
+ fi |
| 4299 |
+- if test $pass = scan; then |
| 4300 |
++ if test "$pass" = scan; then |
| 4301 |
+ deplibs="$deplib $deplibs" |
| 4302 |
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
| 4303 |
+ else |
| 4304 |
+@@ -1417,7 +1417,7 @@ |
| 4305 |
+ continue |
| 4306 |
+ ;; # -L |
| 4307 |
+ -R*) |
| 4308 |
+- if test $pass = link; then |
| 4309 |
++ if test "$pass" = link; then |
| 4310 |
+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` |
| 4311 |
+ # Make sure the xrpath contains only unique directories. |
| 4312 |
+ case "$xrpath " in |
| 4313 |
+@@ -1430,7 +1430,7 @@ |
| 4314 |
+ ;; |
| 4315 |
+ *.la) lib="$deplib" ;; |
| 4316 |
+ *.$libext) |
| 4317 |
+- if test $pass = conv; then |
| 4318 |
++ if test "$pass" = conv; then |
| 4319 |
+ deplibs="$deplib $deplibs" |
| 4320 |
+ continue |
| 4321 |
+ fi |
| 4322 |
+@@ -1451,7 +1451,7 @@ |
| 4323 |
+ continue |
| 4324 |
+ ;; |
| 4325 |
+ prog) |
| 4326 |
+- if test $pass != link; then |
| 4327 |
++ if test "$pass" != link; then |
| 4328 |
+ deplibs="$deplib $deplibs" |
| 4329 |
+ else |
| 4330 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 4331 |
+@@ -1462,7 +1462,7 @@ |
| 4332 |
+ esac # linkmode |
| 4333 |
+ ;; # *.$libext |
| 4334 |
+ *.lo | *.$objext) |
| 4335 |
+- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 4336 |
++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 4337 |
+ # If there is no dlopen support or we're linking statically, |
| 4338 |
+ # we need to preload. |
| 4339 |
+ newdlprefiles="$newdlprefiles $deplib" |
| 4340 |
+@@ -1512,13 +1512,13 @@ |
| 4341 |
+ |
| 4342 |
+ if test "$linkmode,$pass" = "lib,link" || |
| 4343 |
+ test "$linkmode,$pass" = "prog,scan" || |
| 4344 |
+- { test $linkmode = oldlib && test $linkmode = obj; }; then |
| 4345 |
++ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then |
| 4346 |
+ # Add dl[pre]opened files of deplib |
| 4347 |
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
| 4348 |
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
| 4349 |
+ fi |
| 4350 |
+ |
| 4351 |
+- if test $pass = conv; then |
| 4352 |
++ if test "$pass" = conv; then |
| 4353 |
+ # Only check for convenience libraries |
| 4354 |
+ deplibs="$lib $deplibs" |
| 4355 |
+ if test -z "$libdir"; then |
| 4356 |
+@@ -1537,7 +1537,7 @@ |
| 4357 |
+ esac |
| 4358 |
+ tmp_libs="$tmp_libs $deplib" |
| 4359 |
+ done |
| 4360 |
+- elif test $linkmode != prog && test $linkmode != lib; then |
| 4361 |
++ elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 4362 |
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2 |
| 4363 |
+ exit 1 |
| 4364 |
+ fi |
| 4365 |
+@@ -1555,7 +1555,7 @@ |
| 4366 |
+ fi |
| 4367 |
+ |
| 4368 |
+ # This library was specified with -dlopen. |
| 4369 |
+- if test $pass = dlopen; then |
| 4370 |
++ if test "$pass" = dlopen; then |
| 4371 |
+ if test -z "$libdir"; then |
| 4372 |
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 |
| 4373 |
+ exit 1 |
| 4374 |
+@@ -1604,7 +1604,7 @@ |
| 4375 |
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` |
| 4376 |
+ |
| 4377 |
+ # This library was specified with -dlpreopen. |
| 4378 |
+- if test $pass = dlpreopen; then |
| 4379 |
++ if test "$pass" = dlpreopen; then |
| 4380 |
+ if test -z "$libdir"; then |
| 4381 |
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 |
| 4382 |
+ exit 1 |
| 4383 |
+@@ -1623,7 +1623,7 @@ |
| 4384 |
+ |
| 4385 |
+ if test -z "$libdir"; then |
| 4386 |
+ # Link the convenience library |
| 4387 |
+- if test $linkmode = lib; then |
| 4388 |
++ if test "$linkmode" = lib; then |
| 4389 |
+ deplibs="$dir/$old_library $deplibs" |
| 4390 |
+ elif test "$linkmode,$pass" = "prog,link"; then |
| 4391 |
+ compile_deplibs="$dir/$old_library $compile_deplibs" |
| 4392 |
+@@ -1634,7 +1634,7 @@ |
| 4393 |
+ continue |
| 4394 |
+ fi |
| 4395 |
+ |
| 4396 |
+- if test $linkmode = prog && test $pass != link; then |
| 4397 |
++ if test "$linkmode" = prog && test "$pass" != link; then |
| 4398 |
+ newlib_search_path="$newlib_search_path $ladir" |
| 4399 |
+ deplibs="$lib $deplibs" |
| 4400 |
+ |
| 4401 |
+@@ -1671,7 +1671,7 @@ |
| 4402 |
+ # Link against this shared library |
| 4403 |
+ |
| 4404 |
+ if test "$linkmode,$pass" = "prog,link" || |
| 4405 |
+- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then |
| 4406 |
++ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then |
| 4407 |
+ # Hardcode the library path. |
| 4408 |
+ # Skip directories that are in the system default run-time |
| 4409 |
+ # search path. |
| 4410 |
+@@ -1693,7 +1693,7 @@ |
| 4411 |
+ esac |
| 4412 |
+ ;; |
| 4413 |
+ esac |
| 4414 |
+- if test $linkmode = prog; then |
| 4415 |
++ if test "$linkmode" = prog; then |
| 4416 |
+ # We need to hardcode the library path |
| 4417 |
+ if test -n "$shlibpath_var"; then |
| 4418 |
+ # Make sure the rpath contains only unique directories. |
| 4419 |
+@@ -1777,7 +1777,7 @@ |
| 4420 |
+ linklib=$newlib |
| 4421 |
+ fi # test -n $old_archive_from_expsyms_cmds |
| 4422 |
+ |
| 4423 |
+- if test $linkmode = prog || test "$mode" != relink; then |
| 4424 |
++ if test "$linkmode" = prog || test "$mode" != relink; then |
| 4425 |
+ add_shlibpath= |
| 4426 |
+ add_dir= |
| 4427 |
+ add= |
| 4428 |
+@@ -1826,7 +1826,7 @@ |
| 4429 |
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
| 4430 |
+ esac |
| 4431 |
+ fi |
| 4432 |
+- if test $linkmode = prog; then |
| 4433 |
++ if test "$linkmode" = prog; then |
| 4434 |
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" |
| 4435 |
+ test -n "$add" && compile_deplibs="$add $compile_deplibs" |
| 4436 |
+ else |
| 4437 |
+@@ -1843,7 +1843,7 @@ |
| 4438 |
+ fi |
| 4439 |
+ fi |
| 4440 |
+ |
| 4441 |
+- if test $linkmode = prog || test "$mode" = relink; then |
| 4442 |
++ if test "$linkmode" = prog || test "$mode" = relink; then |
| 4443 |
+ add_shlibpath= |
| 4444 |
+ add_dir= |
| 4445 |
+ add= |
| 4446 |
+@@ -1865,7 +1865,7 @@ |
| 4447 |
+ add="-l$name" |
| 4448 |
+ fi |
| 4449 |
+ |
| 4450 |
+- if test $linkmode = prog; then |
| 4451 |
++ if test "$linkmode" = prog; then |
| 4452 |
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 4453 |
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
| 4454 |
+ else |
| 4455 |
+@@ -1873,7 +1873,7 @@ |
| 4456 |
+ test -n "$add" && deplibs="$add $deplibs" |
| 4457 |
+ fi |
| 4458 |
+ fi |
| 4459 |
+- elif test $linkmode = prog; then |
| 4460 |
++ elif test "$linkmode" = prog; then |
| 4461 |
+ if test "$alldeplibs" = yes && |
| 4462 |
+ { test "$deplibs_check_method" = pass_all || |
| 4463 |
+ { test "$build_libtool_libs" = yes && |
| 4464 |
+@@ -1932,9 +1932,9 @@ |
| 4465 |
+ fi |
| 4466 |
+ fi # link shared/static library? |
| 4467 |
+ |
| 4468 |
+- if test $linkmode = lib; then |
| 4469 |
++ if test "$linkmode" = lib; then |
| 4470 |
+ if test -n "$dependency_libs" && |
| 4471 |
+- { test $hardcode_into_libs != yes || test $build_old_libs = yes || |
| 4472 |
++ { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || |
| 4473 |
+ test $link_static = yes; }; then |
| 4474 |
+ # Extract -R from dependency_libs |
| 4475 |
+ temp_deplibs= |
| 4476 |
+@@ -1964,7 +1964,7 @@ |
| 4477 |
+ tmp_libs="$tmp_libs $deplib" |
| 4478 |
+ done |
| 4479 |
+ |
| 4480 |
+- if test $link_all_deplibs != no; then |
| 4481 |
++ if test "$link_all_deplibs" != no; then |
| 4482 |
+ # Add the search paths of all dependency libraries |
| 4483 |
+ for deplib in $dependency_libs; do |
| 4484 |
+ case $deplib in |
| 4485 |
+@@ -2007,15 +2007,15 @@ |
| 4486 |
+ fi # link_all_deplibs != no |
| 4487 |
+ fi # linkmode = lib |
| 4488 |
+ done # for deplib in $libs |
| 4489 |
+- if test $pass = dlpreopen; then |
| 4490 |
++ if test "$pass" = dlpreopen; then |
| 4491 |
+ # Link the dlpreopened libraries before other libraries |
| 4492 |
+ for deplib in $save_deplibs; do |
| 4493 |
+ deplibs="$deplib $deplibs" |
| 4494 |
+ done |
| 4495 |
+ fi |
| 4496 |
+- if test $pass != dlopen; then |
| 4497 |
+- test $pass != scan && dependency_libs="$newdependency_libs" |
| 4498 |
+- if test $pass != conv; then |
| 4499 |
++ if test "$pass" != dlopen; then |
| 4500 |
++ test "$pass" != scan && dependency_libs="$newdependency_libs" |
| 4501 |
++ if test "$pass" != conv; then |
| 4502 |
+ # Make sure lib_search_path contains only unique directories. |
| 4503 |
+ lib_search_path= |
| 4504 |
+ for dir in $newlib_search_path; do |
| 4505 |
+@@ -2073,7 +2073,7 @@ |
| 4506 |
+ deplibs= |
| 4507 |
+ fi |
| 4508 |
+ done # for pass |
| 4509 |
+- if test $linkmode = prog; then |
| 4510 |
++ if test "$linkmode" = prog; then |
| 4511 |
+ dlfiles="$newdlfiles" |
| 4512 |
+ dlprefiles="$newdlprefiles" |
| 4513 |
+ fi |
| 4514 |
+@@ -2410,7 +2410,7 @@ |
| 4515 |
+ ;; |
| 4516 |
+ *) |
| 4517 |
+ # Add libc to deplibs on all other systems if necessary. |
| 4518 |
+- if test $build_libtool_need_lc = "yes"; then |
| 4519 |
++ if test "$build_libtool_need_lc" = "yes"; then |
| 4520 |
+ deplibs="$deplibs -lc" |
| 4521 |
+ fi |
| 4522 |
+ ;; |
| 4523 |
+@@ -2683,7 +2683,7 @@ |
| 4524 |
+ |
| 4525 |
+ # Test again, we may have decided not to build it any more |
| 4526 |
+ if test "$build_libtool_libs" = yes; then |
| 4527 |
+- if test $hardcode_into_libs = yes; then |
| 4528 |
++ if test "$hardcode_into_libs" = yes; then |
| 4529 |
+ # Hardcode the library paths |
| 4530 |
+ hardcode_libdirs= |
| 4531 |
+ dep_rpath= |
| 4532 |
|
| 4533 |
diff --git a/eclass/ELT-patches/test/1.4.2 b/eclass/ELT-patches/test/1.4.2 |
| 4534 |
new file mode 100644 |
| 4535 |
index 0000000..8ae65ef |
| 4536 |
--- /dev/null |
| 4537 |
+++ b/eclass/ELT-patches/test/1.4.2 |
| 4538 |
@@ -0,0 +1,578 @@ |
| 4539 |
+--- ltmain.sh 2001-09-10 19:40:18.000000000 -0400 |
| 4540 |
++++ ltmain.sh 2002-07-11 14:49:35.000000000 -0400 |
| 4541 |
+@@ -467,7 +467,7 @@ if test -z "$show_help"; then |
| 4542 |
+ pic_mode=default |
| 4543 |
+ ;; |
| 4544 |
+ esac |
| 4545 |
+- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then |
| 4546 |
++ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then |
| 4547 |
+ # non-PIC code in shared libraries is not supported |
| 4548 |
+ pic_mode=default |
| 4549 |
+ fi |
| 4550 |
+@@ -1303,11 +1303,11 @@ compiler." |
| 4551 |
+ output_objdir="$output_objdir/$objdir" |
| 4552 |
+ fi |
| 4553 |
+ # Create the object directory. |
| 4554 |
+- if test ! -d $output_objdir; then |
| 4555 |
++ if test ! -d "$output_objdir"; then |
| 4556 |
+ $show "$mkdir $output_objdir" |
| 4557 |
+ $run $mkdir $output_objdir |
| 4558 |
+ status=$? |
| 4559 |
+- if test $status -ne 0 && test ! -d $output_objdir; then |
| 4560 |
++ if test "$status" -ne 0 && test ! -d "$output_objdir"; then |
| 4561 |
+ exit $status |
| 4562 |
+ fi |
| 4563 |
+ fi |
| 4564 |
+@@ -1366,7 +1366,7 @@ compiler." |
| 4565 |
+ ;; |
| 4566 |
+ esac |
| 4567 |
+ for pass in $passes; do |
| 4568 |
+- if test $linkmode = prog; then |
| 4569 |
++ if test "$linkmode" = prog; then |
| 4570 |
+ # Determine which files to process |
| 4571 |
+ case $pass in |
| 4572 |
+ dlopen) |
| 4573 |
+@@ -1383,11 +1383,11 @@ compiler." |
| 4574 |
+ found=no |
| 4575 |
+ case $deplib in |
| 4576 |
+ -l*) |
| 4577 |
+- if test $linkmode = oldlib && test $linkmode = obj; then |
| 4578 |
++ if test "$linkmode" = oldlib && test "$linkmode" = obj; then |
| 4579 |
+ $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 |
| 4580 |
+ continue |
| 4581 |
+ fi |
| 4582 |
+- if test $pass = conv; then |
| 4583 |
++ if test "$pass" = conv; then |
| 4584 |
+ deplibs="$deplib $deplibs" |
| 4585 |
+ continue |
| 4586 |
+ fi |
| 4587 |
+@@ -1407,7 +1407,7 @@ compiler." |
| 4588 |
+ finalize_deplibs="$deplib $finalize_deplibs" |
| 4589 |
+ else |
| 4590 |
+ deplibs="$deplib $deplibs" |
| 4591 |
+- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" |
| 4592 |
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" |
| 4593 |
+ fi |
| 4594 |
+ continue |
| 4595 |
+ fi |
| 4596 |
+@@ -1416,16 +1416,16 @@ compiler." |
| 4597 |
+ case $linkmode in |
| 4598 |
+ lib) |
| 4599 |
+ deplibs="$deplib $deplibs" |
| 4600 |
+- test $pass = conv && continue |
| 4601 |
++ test "$pass" = conv && continue |
| 4602 |
+ newdependency_libs="$deplib $newdependency_libs" |
| 4603 |
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
| 4604 |
+ ;; |
| 4605 |
+ prog) |
| 4606 |
+- if test $pass = conv; then |
| 4607 |
++ if test "$pass" = conv; then |
| 4608 |
+ deplibs="$deplib $deplibs" |
| 4609 |
+ continue |
| 4610 |
+ fi |
| 4611 |
+- if test $pass = scan; then |
| 4612 |
++ if test "$pass" = scan; then |
| 4613 |
+ deplibs="$deplib $deplibs" |
| 4614 |
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
| 4615 |
+ else |
| 4616 |
+@@ -1440,7 +1440,7 @@ compiler." |
| 4617 |
+ continue |
| 4618 |
+ ;; # -L |
| 4619 |
+ -R*) |
| 4620 |
+- if test $pass = link; then |
| 4621 |
++ if test "$pass" = link; then |
| 4622 |
+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` |
| 4623 |
+ # Make sure the xrpath contains only unique directories. |
| 4624 |
+ case "$xrpath " in |
| 4625 |
+@@ -1453,7 +1453,7 @@ compiler." |
| 4626 |
+ ;; |
| 4627 |
+ *.la) lib="$deplib" ;; |
| 4628 |
+ *.$libext) |
| 4629 |
+- if test $pass = conv; then |
| 4630 |
++ if test "$pass" = conv; then |
| 4631 |
+ deplibs="$deplib $deplibs" |
| 4632 |
+ continue |
| 4633 |
+ fi |
| 4634 |
+@@ -1474,7 +1474,7 @@ compiler." |
| 4635 |
+ continue |
| 4636 |
+ ;; |
| 4637 |
+ prog) |
| 4638 |
+- if test $pass != link; then |
| 4639 |
++ if test "$pass" != link; then |
| 4640 |
+ deplibs="$deplib $deplibs" |
| 4641 |
+ else |
| 4642 |
+ compile_deplibs="$deplib $compile_deplibs" |
| 4643 |
+@@ -1485,7 +1485,7 @@ compiler." |
| 4644 |
+ esac # linkmode |
| 4645 |
+ ;; # *.$libext |
| 4646 |
+ *.lo | *.$objext) |
| 4647 |
+- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 4648 |
++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 4649 |
+ # If there is no dlopen support or we're linking statically, |
| 4650 |
+ # we need to preload. |
| 4651 |
+ newdlprefiles="$newdlprefiles $deplib" |
| 4652 |
+@@ -1501,7 +1501,7 @@ compiler." |
| 4653 |
+ continue |
| 4654 |
+ ;; |
| 4655 |
+ esac # case $deplib |
| 4656 |
+- if test $found = yes || test -f "$lib"; then : |
| 4657 |
++ if test "$found" = yes || test -f "$lib"; then : |
| 4658 |
+ else |
| 4659 |
+ $echo "$modename: cannot find the library \`$lib'" 1>&2 |
| 4660 |
+ exit 1 |
| 4661 |
+@@ -1535,13 +1535,13 @@ compiler." |
| 4662 |
+ |
| 4663 |
+ if test "$linkmode,$pass" = "lib,link" || |
| 4664 |
+ test "$linkmode,$pass" = "prog,scan" || |
| 4665 |
+- { test $linkmode = oldlib && test $linkmode = obj; }; then |
| 4666 |
++ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then |
| 4667 |
+ # Add dl[pre]opened files of deplib |
| 4668 |
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
| 4669 |
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
| 4670 |
+ fi |
| 4671 |
+ |
| 4672 |
+- if test $pass = conv; then |
| 4673 |
++ if test "$pass" = conv; then |
| 4674 |
+ # Only check for convenience libraries |
| 4675 |
+ deplibs="$lib $deplibs" |
| 4676 |
+ if test -z "$libdir"; then |
| 4677 |
+@@ -1560,7 +1560,7 @@ compiler." |
| 4678 |
+ esac |
| 4679 |
+ tmp_libs="$tmp_libs $deplib" |
| 4680 |
+ done |
| 4681 |
+- elif test $linkmode != prog && test $linkmode != lib; then |
| 4682 |
++ elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 4683 |
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2 |
| 4684 |
+ exit 1 |
| 4685 |
+ fi |
| 4686 |
+@@ -1578,7 +1578,7 @@ compiler." |
| 4687 |
+ fi |
| 4688 |
+ |
| 4689 |
+ # This library was specified with -dlopen. |
| 4690 |
+- if test $pass = dlopen; then |
| 4691 |
++ if test "$pass" = dlopen; then |
| 4692 |
+ if test -z "$libdir"; then |
| 4693 |
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 |
| 4694 |
+ exit 1 |
| 4695 |
+@@ -1627,7 +1627,7 @@ compiler." |
| 4696 |
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` |
| 4697 |
+ |
| 4698 |
+ # This library was specified with -dlpreopen. |
| 4699 |
+- if test $pass = dlpreopen; then |
| 4700 |
++ if test "$pass" = dlpreopen; then |
| 4701 |
+ if test -z "$libdir"; then |
| 4702 |
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 |
| 4703 |
+ exit 1 |
| 4704 |
+@@ -1646,7 +1646,7 @@ compiler." |
| 4705 |
+ |
| 4706 |
+ if test -z "$libdir"; then |
| 4707 |
+ # Link the convenience library |
| 4708 |
+- if test $linkmode = lib; then |
| 4709 |
++ if test "$linkmode" = lib; then |
| 4710 |
+ deplibs="$dir/$old_library $deplibs" |
| 4711 |
+ elif test "$linkmode,$pass" = "prog,link"; then |
| 4712 |
+ compile_deplibs="$dir/$old_library $compile_deplibs" |
| 4713 |
+@@ -1657,7 +1657,7 @@ compiler." |
| 4714 |
+ continue |
| 4715 |
+ fi |
| 4716 |
+ |
| 4717 |
+- if test $linkmode = prog && test $pass != link; then |
| 4718 |
++ if test "$linkmode" = prog && test "$pass" != link; then |
| 4719 |
+ newlib_search_path="$newlib_search_path $ladir" |
| 4720 |
+ deplibs="$lib $deplibs" |
| 4721 |
+ |
| 4722 |
+@@ -1673,7 +1673,7 @@ compiler." |
| 4723 |
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
| 4724 |
+ esac |
| 4725 |
+ # Need to link against all dependency_libs? |
| 4726 |
+- if test $linkalldeplibs = yes; then |
| 4727 |
++ if test "$linkalldeplibs" = yes; then |
| 4728 |
+ deplibs="$deplib $deplibs" |
| 4729 |
+ else |
| 4730 |
+ # Need to hardcode shared library paths |
| 4731 |
+@@ -1694,7 +1694,7 @@ compiler." |
| 4732 |
+ # Link against this shared library |
| 4733 |
+ |
| 4734 |
+ if test "$linkmode,$pass" = "prog,link" || |
| 4735 |
+- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then |
| 4736 |
++ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then |
| 4737 |
+ # Hardcode the library path. |
| 4738 |
+ # Skip directories that are in the system default run-time |
| 4739 |
+ # search path. |
| 4740 |
+@@ -1716,7 +1716,7 @@ compiler." |
| 4741 |
+ esac |
| 4742 |
+ ;; |
| 4743 |
+ esac |
| 4744 |
+- if test $linkmode = prog; then |
| 4745 |
++ if test "$linkmode" = prog; then |
| 4746 |
+ # We need to hardcode the library path |
| 4747 |
+ if test -n "$shlibpath_var"; then |
| 4748 |
+ # Make sure the rpath contains only unique directories. |
| 4749 |
+@@ -1798,9 +1798,9 @@ compiler." |
| 4750 |
+ # make sure the library variables are pointing to the new library |
| 4751 |
+ dir=$output_objdir |
| 4752 |
+ linklib=$newlib |
| 4753 |
+- fi # test -n $old_archive_from_expsyms_cmds |
| 4754 |
++ fi # test -n "$old_archive_from_expsyms_cmds" |
| 4755 |
+ |
| 4756 |
+- if test $linkmode = prog || test "$mode" != relink; then |
| 4757 |
++ if test "$linkmode" = prog || test "$mode" != relink; then |
| 4758 |
+ add_shlibpath= |
| 4759 |
+ add_dir= |
| 4760 |
+ add= |
| 4761 |
+@@ -1849,7 +1849,7 @@ compiler." |
| 4762 |
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
| 4763 |
+ esac |
| 4764 |
+ fi |
| 4765 |
+- if test $linkmode = prog; then |
| 4766 |
++ if test "$linkmode" = prog; then |
| 4767 |
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" |
| 4768 |
+ test -n "$add" && compile_deplibs="$add $compile_deplibs" |
| 4769 |
+ else |
| 4770 |
+@@ -1866,7 +1866,7 @@ compiler." |
| 4771 |
+ fi |
| 4772 |
+ fi |
| 4773 |
+ |
| 4774 |
+- if test $linkmode = prog || test "$mode" = relink; then |
| 4775 |
++ if test "$linkmode" = prog || test "$mode" = relink; then |
| 4776 |
+ add_shlibpath= |
| 4777 |
+ add_dir= |
| 4778 |
+ add= |
| 4779 |
+@@ -1888,7 +1888,7 @@ compiler." |
| 4780 |
+ add="-l$name" |
| 4781 |
+ fi |
| 4782 |
+ |
| 4783 |
+- if test $linkmode = prog; then |
| 4784 |
++ if test "$linkmode" = prog; then |
| 4785 |
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 4786 |
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
| 4787 |
+ else |
| 4788 |
+@@ -1896,7 +1896,7 @@ compiler." |
| 4789 |
+ test -n "$add" && deplibs="$add $deplibs" |
| 4790 |
+ fi |
| 4791 |
+ fi |
| 4792 |
+- elif test $linkmode = prog; then |
| 4793 |
++ elif test "$linkmode" = prog; then |
| 4794 |
+ if test "$alldeplibs" = yes && |
| 4795 |
+ { test "$deplibs_check_method" = pass_all || |
| 4796 |
+ { test "$build_libtool_libs" = yes && |
| 4797 |
+@@ -1955,10 +1955,10 @@ compiler." |
| 4798 |
+ fi |
| 4799 |
+ fi # link shared/static library? |
| 4800 |
+ |
| 4801 |
+- if test $linkmode = lib; then |
| 4802 |
++ if test "$linkmode" = lib; then |
| 4803 |
+ if test -n "$dependency_libs" && |
| 4804 |
+- { test $hardcode_into_libs != yes || test $build_old_libs = yes || |
| 4805 |
+- test $link_static = yes; }; then |
| 4806 |
++ { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || |
| 4807 |
++ test "$link_static" = yes; }; then |
| 4808 |
+ # Extract -R from dependency_libs |
| 4809 |
+ temp_deplibs= |
| 4810 |
+ for libdir in $dependency_libs; do |
| 4811 |
+@@ -1987,7 +1987,7 @@ compiler." |
| 4812 |
+ tmp_libs="$tmp_libs $deplib" |
| 4813 |
+ done |
| 4814 |
+ |
| 4815 |
+- if test $link_all_deplibs != no; then |
| 4816 |
++ if test "$link_all_deplibs" != no; then |
| 4817 |
+ # Add the search paths of all dependency libraries |
| 4818 |
+ for deplib in $dependency_libs; do |
| 4819 |
+ case $deplib in |
| 4820 |
+@@ -2030,15 +2030,15 @@ compiler." |
| 4821 |
+ fi # link_all_deplibs != no |
| 4822 |
+ fi # linkmode = lib |
| 4823 |
+ done # for deplib in $libs |
| 4824 |
+- if test $pass = dlpreopen; then |
| 4825 |
++ if test "$pass" = dlpreopen; then |
| 4826 |
+ # Link the dlpreopened libraries before other libraries |
| 4827 |
+ for deplib in $save_deplibs; do |
| 4828 |
+ deplibs="$deplib $deplibs" |
| 4829 |
+ done |
| 4830 |
+ fi |
| 4831 |
+- if test $pass != dlopen; then |
| 4832 |
+- test $pass != scan && dependency_libs="$newdependency_libs" |
| 4833 |
+- if test $pass != conv; then |
| 4834 |
++ if test "$pass" != dlopen; then |
| 4835 |
++ test "$pass" != scan && dependency_libs="$newdependency_libs" |
| 4836 |
++ if test "$pass" != conv; then |
| 4837 |
+ # Make sure lib_search_path contains only unique directories. |
| 4838 |
+ lib_search_path= |
| 4839 |
+ for dir in $newlib_search_path; do |
| 4840 |
+@@ -2096,7 +2096,7 @@ compiler." |
| 4841 |
+ deplibs= |
| 4842 |
+ fi |
| 4843 |
+ done # for pass |
| 4844 |
+- if test $linkmode = prog; then |
| 4845 |
++ if test "$linkmode" = prog; then |
| 4846 |
+ dlfiles="$newdlfiles" |
| 4847 |
+ dlprefiles="$newdlprefiles" |
| 4848 |
+ fi |
| 4849 |
+@@ -2173,7 +2173,7 @@ compiler." |
| 4850 |
+ fi |
| 4851 |
+ |
| 4852 |
+ set dummy $rpath |
| 4853 |
+- if test $# -gt 2; then |
| 4854 |
++ if test "$#" -gt 2; then |
| 4855 |
+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 |
| 4856 |
+ fi |
| 4857 |
+ install_libdir="$2" |
| 4858 |
+@@ -2240,7 +2240,7 @@ compiler." |
| 4859 |
+ ;; |
| 4860 |
+ esac |
| 4861 |
+ |
| 4862 |
+- if test $age -gt $current; then |
| 4863 |
++ if test "$age" -gt "$current"; then |
| 4864 |
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 |
| 4865 |
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
| 4866 |
+ exit 1 |
| 4867 |
+@@ -2279,7 +2279,7 @@ compiler." |
| 4868 |
+ |
| 4869 |
+ # Add in all the interfaces that we are compatible with. |
| 4870 |
+ loop=$revision |
| 4871 |
+- while test $loop != 0; do |
| 4872 |
++ while test "$loop" -ne 0; do |
| 4873 |
+ iface=`expr $revision - $loop` |
| 4874 |
+ loop=`expr $loop - 1` |
| 4875 |
+ verstring="sgi$major.$iface:$verstring" |
| 4876 |
+@@ -2302,7 +2302,7 @@ compiler." |
| 4877 |
+ |
| 4878 |
+ # Add in all the interfaces that we are compatible with. |
| 4879 |
+ loop=$age |
| 4880 |
+- while test $loop != 0; do |
| 4881 |
++ while test "$loop" -ne 0; do |
| 4882 |
+ iface=`expr $current - $loop` |
| 4883 |
+ loop=`expr $loop - 1` |
| 4884 |
+ verstring="$verstring:${iface}.0" |
| 4885 |
+@@ -2403,7 +2403,7 @@ compiler." |
| 4886 |
+ *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 4887 |
+ esac |
| 4888 |
+ done |
| 4889 |
+- if test $hardcode_into_libs != yes || test $build_old_libs = yes; then |
| 4890 |
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then |
| 4891 |
+ dependency_libs="$temp_xrpath $dependency_libs" |
| 4892 |
+ fi |
| 4893 |
+ fi |
| 4894 |
+@@ -2446,7 +2446,7 @@ compiler." |
| 4895 |
+ ;; |
| 4896 |
+ *) |
| 4897 |
+ # Add libc to deplibs on all other systems if necessary. |
| 4898 |
+- if test $build_libtool_need_lc = "yes"; then |
| 4899 |
++ if test "$build_libtool_need_lc" = "yes"; then |
| 4900 |
+ deplibs="$deplibs -lc" |
| 4901 |
+ fi |
| 4902 |
+ ;; |
| 4903 |
+@@ -2487,7 +2487,7 @@ compiler." |
| 4904 |
+ EOF |
| 4905 |
+ $rm conftest |
| 4906 |
+ $CC -o conftest conftest.c $deplibs |
| 4907 |
+- if test $? -eq 0 ; then |
| 4908 |
++ if test "$?" -eq 0 ; then |
| 4909 |
+ ldd_output=`ldd conftest` |
| 4910 |
+ for i in $deplibs; do |
| 4911 |
+ name="`expr $i : '-l\(.*\)'`" |
| 4912 |
+@@ -2521,7 +2521,7 @@ EOF |
| 4913 |
+ $rm conftest |
| 4914 |
+ $CC -o conftest conftest.c $i |
| 4915 |
+ # Did it work? |
| 4916 |
+- if test $? -eq 0 ; then |
| 4917 |
++ if test "$?" -eq 0 ; then |
| 4918 |
+ ldd_output=`ldd conftest` |
| 4919 |
+ libname=`eval \\$echo \"$libname_spec\"` |
| 4920 |
+ deplib_matches=`eval \\$echo \"$library_names_spec\"` |
| 4921 |
+@@ -2692,7 +2692,7 @@ EOF |
| 4922 |
+ echo "*** automatically added whenever a program is linked with this library" |
| 4923 |
+ echo "*** or is declared to -dlopen it." |
| 4924 |
+ |
| 4925 |
+- if test $allow_undefined = no; then |
| 4926 |
++ if test "$allow_undefined" = no; then |
| 4927 |
+ echo |
| 4928 |
+ echo "*** Since this library must not contain undefined symbols," |
| 4929 |
+ echo "*** because either the platform does not support them or" |
| 4930 |
+@@ -2719,7 +2719,7 @@ EOF |
| 4931 |
+ |
| 4932 |
+ # Test again, we may have decided not to build it any more |
| 4933 |
+ if test "$build_libtool_libs" = yes; then |
| 4934 |
+- if test $hardcode_into_libs = yes; then |
| 4935 |
++ if test "$hardcode_into_libs" = yes; then |
| 4936 |
+ # Hardcode the library paths |
| 4937 |
+ hardcode_libdirs= |
| 4938 |
+ dep_rpath= |
| 4939 |
+@@ -2850,7 +2850,7 @@ EOF |
| 4940 |
+ $show "mkdir $gentop" |
| 4941 |
+ $run mkdir "$gentop" |
| 4942 |
+ status=$? |
| 4943 |
+- if test $status -ne 0 && test ! -d "$gentop"; then |
| 4944 |
++ if test "$status" -ne 0 && test ! -d "$gentop"; then |
| 4945 |
+ exit $status |
| 4946 |
+ fi |
| 4947 |
+ generated="$generated $gentop" |
| 4948 |
+@@ -2869,7 +2869,7 @@ EOF |
| 4949 |
+ $show "mkdir $xdir" |
| 4950 |
+ $run mkdir "$xdir" |
| 4951 |
+ status=$? |
| 4952 |
+- if test $status -ne 0 && test ! -d "$xdir"; then |
| 4953 |
++ if test "$status" -ne 0 && test ! -d "$xdir"; then |
| 4954 |
+ exit $status |
| 4955 |
+ fi |
| 4956 |
+ $show "(cd $xdir && $AR x $xabs)" |
| 4957 |
+@@ -2989,7 +2989,7 @@ EOF |
| 4958 |
+ $show "mkdir $gentop" |
| 4959 |
+ $run mkdir "$gentop" |
| 4960 |
+ status=$? |
| 4961 |
+- if test $status -ne 0 && test ! -d "$gentop"; then |
| 4962 |
++ if test "$status" -ne 0 && test ! -d "$gentop"; then |
| 4963 |
+ exit $status |
| 4964 |
+ fi |
| 4965 |
+ generated="$generated $gentop" |
| 4966 |
+@@ -3008,7 +3008,7 @@ EOF |
| 4967 |
+ $show "mkdir $xdir" |
| 4968 |
+ $run mkdir "$xdir" |
| 4969 |
+ status=$? |
| 4970 |
+- if test $status -ne 0 && test ! -d "$xdir"; then |
| 4971 |
++ if test "$status" -ne 0 && test ! -d "$xdir"; then |
| 4972 |
+ exit $status |
| 4973 |
+ fi |
| 4974 |
+ $show "(cd $xdir && $AR x $xabs)" |
| 4975 |
+@@ -3403,7 +3403,7 @@ static const void *lt_preloaded_setup() |
| 4976 |
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` |
| 4977 |
+ fi |
| 4978 |
+ |
| 4979 |
+- if test $need_relink = no || test "$build_libtool_libs" != yes; then |
| 4980 |
++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then |
| 4981 |
+ # Replace the output file specification. |
| 4982 |
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` |
| 4983 |
+ link_command="$compile_command$compile_rpath" |
| 4984 |
+@@ -3528,7 +3528,7 @@ static const void *lt_preloaded_setup() |
| 4985 |
+ relink_command="$var=\"$var_value\"; export $var; $relink_command" |
| 4986 |
+ fi |
| 4987 |
+ done |
| 4988 |
+- relink_command="cd `pwd`; $relink_command" |
| 4989 |
++ relink_command="(cd `pwd`; $relink_command)" |
| 4990 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 4991 |
+ fi |
| 4992 |
+ |
| 4993 |
+@@ -3771,7 +3771,7 @@ fi\ |
| 4994 |
+ $show "mkdir $gentop" |
| 4995 |
+ $run mkdir "$gentop" |
| 4996 |
+ status=$? |
| 4997 |
+- if test $status -ne 0 && test ! -d "$gentop"; then |
| 4998 |
++ if test "$status" -ne 0 && test ! -d "$gentop"; then |
| 4999 |
+ exit $status |
| 5000 |
+ fi |
| 5001 |
+ generated="$generated $gentop" |
| 5002 |
+@@ -3791,7 +3791,7 @@ fi\ |
| 5003 |
+ $show "mkdir $xdir" |
| 5004 |
+ $run mkdir "$xdir" |
| 5005 |
+ status=$? |
| 5006 |
+- if test $status -ne 0 && test ! -d "$xdir"; then |
| 5007 |
++ if test "$status" -ne 0 && test ! -d "$xdir"; then |
| 5008 |
+ exit $status |
| 5009 |
+ fi |
| 5010 |
+ $show "(cd $xdir && $AR x $xabs)" |
| 5011 |
+@@ -3858,7 +3858,7 @@ fi\ |
| 5012 |
+ fi |
| 5013 |
+ done |
| 5014 |
+ # Quote the link command for shipping. |
| 5015 |
+- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" |
| 5016 |
++ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
| 5017 |
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 5018 |
+ |
| 5019 |
+ # Only create the output if not a dry run. |
| 5020 |
+@@ -3948,7 +3948,7 @@ dlpreopen='$dlprefiles' |
| 5021 |
+ |
| 5022 |
+ # Directory that this library needs to be installed in: |
| 5023 |
+ libdir='$install_libdir'" |
| 5024 |
+- if test "$installed" = no && test $need_relink = yes; then |
| 5025 |
++ if test "$installed" = no && test "$need_relink" = yes; then |
| 5026 |
+ $echo >> $output "\ |
| 5027 |
+ relink_command=\"$relink_command\"" |
| 5028 |
+ fi |
| 5029 |
+@@ -4084,7 +4084,7 @@ relink_command=\"$relink_command\"" |
| 5030 |
+ |
| 5031 |
+ # Not a directory, so check to see that there is only one file specified. |
| 5032 |
+ set dummy $files |
| 5033 |
+- if test $# -gt 2; then |
| 5034 |
++ if test "$#" -gt 2; then |
| 5035 |
+ $echo "$modename: \`$dest' is not a directory" 1>&2 |
| 5036 |
+ $echo "$help" 1>&2 |
| 5037 |
+ exit 1 |
| 5038 |
+@@ -4186,7 +4186,7 @@ relink_command=\"$relink_command\"" |
| 5039 |
+ $run eval "$striplib $destdir/$realname" || exit $? |
| 5040 |
+ fi |
| 5041 |
+ |
| 5042 |
+- if test $# -gt 0; then |
| 5043 |
++ if test "$#" -gt 0; then |
| 5044 |
+ # Delete the old symlinks, and create new ones. |
| 5045 |
+ for linkname |
| 5046 |
+ do |
| 5047 |
+@@ -4444,7 +4444,7 @@ relink_command=\"$relink_command\"" |
| 5048 |
+ fi |
| 5049 |
+ |
| 5050 |
+ # Exit here if they wanted silent mode. |
| 5051 |
+- test "$show" = ":" && exit 0 |
| 5052 |
++ test "$show" = : && exit 0 |
| 5053 |
+ |
| 5054 |
+ echo "----------------------------------------------------------------------" |
| 5055 |
+ echo "Libraries have been installed in:" |
| 5056 |
+@@ -4610,7 +4610,7 @@ relink_command=\"$relink_command\"" |
| 5057 |
+ fi |
| 5058 |
+ |
| 5059 |
+ # Now prepare to actually exec the command. |
| 5060 |
+- exec_cmd='"$cmd"$args' |
| 5061 |
++ exec_cmd="\$cmd$args" |
| 5062 |
+ else |
| 5063 |
+ # Display what would be done. |
| 5064 |
+ if test -n "$shlibpath_var"; then |
| 5065 |
+@@ -4660,10 +4660,10 @@ relink_command=\"$relink_command\"" |
| 5066 |
+ objdir="$dir/$objdir" |
| 5067 |
+ fi |
| 5068 |
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` |
| 5069 |
+- test $mode = uninstall && objdir="$dir" |
| 5070 |
++ test "$mode" = uninstall && objdir="$dir" |
| 5071 |
+ |
| 5072 |
+ # Remember objdir for removal later, being careful to avoid duplicates |
| 5073 |
+- if test $mode = clean; then |
| 5074 |
++ if test "$mode" = clean; then |
| 5075 |
+ case " $rmdirs " in |
| 5076 |
+ *" $objdir "*) ;; |
| 5077 |
+ *) rmdirs="$rmdirs $objdir" ;; |
| 5078 |
+@@ -4695,9 +4695,9 @@ relink_command=\"$relink_command\"" |
| 5079 |
+ rmfiles="$rmfiles $objdir/$n" |
| 5080 |
+ done |
| 5081 |
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" |
| 5082 |
+- test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
| 5083 |
++ test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
| 5084 |
+ |
| 5085 |
+- if test $mode = uninstall; then |
| 5086 |
++ if test "$mode" = uninstall; then |
| 5087 |
+ if test -n "$library_names"; then |
| 5088 |
+ # Do each command in the postuninstall commands. |
| 5089 |
+ eval cmds=\"$postuninstall_cmds\" |
| 5090 |
+@@ -4706,7 +4706,7 @@ relink_command=\"$relink_command\"" |
| 5091 |
+ IFS="$save_ifs" |
| 5092 |
+ $show "$cmd" |
| 5093 |
+ $run eval "$cmd" |
| 5094 |
+- if test $? != 0 && test "$rmforce" != yes; then |
| 5095 |
++ if test "$?" -ne 0 && test "$rmforce" != yes; then |
| 5096 |
+ exit_status=1 |
| 5097 |
+ fi |
| 5098 |
+ done |
| 5099 |
+@@ -4721,7 +4721,7 @@ relink_command=\"$relink_command\"" |
| 5100 |
+ IFS="$save_ifs" |
| 5101 |
+ $show "$cmd" |
| 5102 |
+ $run eval "$cmd" |
| 5103 |
+- if test $? != 0 && test "$rmforce" != yes; then |
| 5104 |
++ if test "$?" -ne 0 && test "$rmforce" != yes; then |
| 5105 |
+ exit_status=1 |
| 5106 |
+ fi |
| 5107 |
+ done |
| 5108 |
+@@ -4741,7 +4741,7 @@ relink_command=\"$relink_command\"" |
| 5109 |
+ |
| 5110 |
+ *) |
| 5111 |
+ # Do a test to see if this is a libtool program. |
| 5112 |
+- if test $mode = clean && |
| 5113 |
++ if test "$mode" = clean && |
| 5114 |
+ (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
| 5115 |
+ relink_command= |
| 5116 |
+ . $dir/$file |
| 5117 |
|
| 5118 |
diff --git a/eclass/ELT-patches/tmp/1.3.5 b/eclass/ELT-patches/tmp/1.3.5 |
| 5119 |
new file mode 100644 |
| 5120 |
index 0000000..29b70e0 |
| 5121 |
--- /dev/null |
| 5122 |
+++ b/eclass/ELT-patches/tmp/1.3.5 |
| 5123 |
@@ -0,0 +1,15 @@ |
| 5124 |
+--- ltmain.sh Fri Jul 7 18:49:44 2000 |
| 5125 |
++++ ltmain.sh Fri May 26 21:53:15 2000 |
| 5126 |
+@@ -3462,7 +3462,11 @@ |
| 5127 |
+ if test "$finalize" = yes && test -z "$run"; then |
| 5128 |
+ tmpdir="/tmp" |
| 5129 |
+ test -n "$TMPDIR" && tmpdir="$TMPDIR" |
| 5130 |
+- tmpdir="$tmpdir/libtool-$$" |
| 5131 |
++ tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` |
| 5132 |
++ if test $? = 0 ; then : |
| 5133 |
++ else |
| 5134 |
++ tmpdir="$tmpdir/libtool-$$" |
| 5135 |
++ fi |
| 5136 |
+ if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : |
| 5137 |
+ else |
| 5138 |
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |
| 5139 |
|
| 5140 |
diff --git a/eclass/ELT-patches/uclibc-conf/1.2.0 b/eclass/ELT-patches/uclibc-conf/1.2.0 |
| 5141 |
new file mode 100644 |
| 5142 |
index 0000000..acd804c |
| 5143 |
--- /dev/null |
| 5144 |
+++ b/eclass/ELT-patches/uclibc-conf/1.2.0 |
| 5145 |
@@ -0,0 +1,48 @@ |
| 5146 |
+--- configure.libltdl~ Fri Jun 11 08:54:04 2004 |
| 5147 |
++++ configure Fri Jun 11 08:56:33 2004 |
| 5148 |
+@@ -1978,6 +1978,11 @@ |
| 5149 |
+ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` |
| 5150 |
+ ;; |
| 5151 |
+ |
| 5152 |
++linux-uclibc*) |
| 5153 |
++ lt_cv_deplibs_check_method=pass_all |
| 5154 |
++ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` |
| 5155 |
++ ;; |
| 5156 |
++ |
| 5157 |
+ netbsd*) |
| 5158 |
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
| 5159 |
+ lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' |
| 5160 |
+@@ -3030,7 +3035,7 @@ |
| 5161 |
+ |
| 5162 |
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 5163 |
+ case $host_os in |
| 5164 |
+-linux-gnu*) ;; |
| 5165 |
++linux-gnu*|linux-uclibc*) ;; |
| 5166 |
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 5167 |
+ esac |
| 5168 |
+ |
| 5169 |
+@@ -4504,6 +4509,24 @@ |
| 5170 |
+ dynamic_linker='GNU/Linux ld.so' |
| 5171 |
+ ;; |
| 5172 |
+ |
| 5173 |
++linux-uclibc*) |
| 5174 |
++ version_type=linux |
| 5175 |
++ need_lib_prefix=no |
| 5176 |
++ need_version=no |
| 5177 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' |
| 5178 |
++ soname_spec='${libname}${release}.so$major' |
| 5179 |
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
| 5180 |
++ shlibpath_var=LD_LIBRARY_PATH |
| 5181 |
++ shlibpath_overrides_runpath=no |
| 5182 |
++ # This implies no fast_install, which is unacceptable. |
| 5183 |
++ # Some rework will be needed to allow for fast_install |
| 5184 |
++ # before this can be enabled. |
| 5185 |
++ # Note: copied from linux-gnu, and may not be appropriate. |
| 5186 |
++ hardcode_into_libs=yes |
| 5187 |
++ # Assume using the uClibc dynamic linker. |
| 5188 |
++ dynamic_linker="uClibc ld.so" |
| 5189 |
++ ;; |
| 5190 |
++ |
| 5191 |
+ netbsd*) |
| 5192 |
+ version_type=sunos |
| 5193 |
+ need_lib_prefix=no |
| 5194 |
|
| 5195 |
diff --git a/eclass/ELT-patches/uclibc-conf/1.3.0c b/eclass/ELT-patches/uclibc-conf/1.3.0c |
| 5196 |
new file mode 100644 |
| 5197 |
index 0000000..03efc5d |
| 5198 |
--- /dev/null |
| 5199 |
+++ b/eclass/ELT-patches/uclibc-conf/1.3.0c |
| 5200 |
@@ -0,0 +1,48 @@ |
| 5201 |
+--- configure.libltdl~ Fri Jun 11 08:54:04 2004 |
| 5202 |
++++ configure Fri Jun 11 08:56:33 2004 |
| 5203 |
+@@ -1978,6 +1978,11 @@ |
| 5204 |
+ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` |
| 5205 |
+ ;; |
| 5206 |
+ |
| 5207 |
++linux-uclibc*) |
| 5208 |
++ lt_cv_deplibs_check_method=pass_all |
| 5209 |
++ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` |
| 5210 |
++ ;; |
| 5211 |
++ |
| 5212 |
+ netbsd*) |
| 5213 |
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
| 5214 |
+ lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' |
| 5215 |
+@@ -3030,7 +3035,7 @@ |
| 5216 |
+ |
| 5217 |
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 5218 |
+ case "$host_os" in |
| 5219 |
+-linux-gnu*) ;; |
| 5220 |
++linux-gnu*|linux-uclibc*) ;; |
| 5221 |
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 5222 |
+ esac |
| 5223 |
+ |
| 5224 |
+@@ -4504,6 +4509,24 @@ |
| 5225 |
+ dynamic_linker='GNU/Linux ld.so' |
| 5226 |
+ ;; |
| 5227 |
+ |
| 5228 |
++linux-uclibc*) |
| 5229 |
++ version_type=linux |
| 5230 |
++ need_lib_prefix=no |
| 5231 |
++ need_version=no |
| 5232 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' |
| 5233 |
++ soname_spec='${libname}${release}.so$major' |
| 5234 |
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
| 5235 |
++ shlibpath_var=LD_LIBRARY_PATH |
| 5236 |
++ shlibpath_overrides_runpath=no |
| 5237 |
++ # This implies no fast_install, which is unacceptable. |
| 5238 |
++ # Some rework will be needed to allow for fast_install |
| 5239 |
++ # before this can be enabled. |
| 5240 |
++ # Note: copied from linux-gnu, and may not be appropriate. |
| 5241 |
++ hardcode_into_libs=yes |
| 5242 |
++ # Assume using the uClibc dynamic linker. |
| 5243 |
++ dynamic_linker="uClibc ld.so" |
| 5244 |
++ ;; |
| 5245 |
++ |
| 5246 |
+ netbsd*) |
| 5247 |
+ version_type=sunos |
| 5248 |
+ need_lib_prefix=no |
| 5249 |
|
| 5250 |
diff --git a/eclass/ELT-patches/uclibc-ltconf/1.2.0 b/eclass/ELT-patches/uclibc-ltconf/1.2.0 |
| 5251 |
new file mode 100644 |
| 5252 |
index 0000000..bbc6bc9 |
| 5253 |
--- /dev/null |
| 5254 |
+++ b/eclass/ELT-patches/uclibc-ltconf/1.2.0 |
| 5255 |
@@ -0,0 +1,36 @@ |
| 5256 |
+--- ltconfig.uclibc 2004-01-14 22:07:42.000000000 +0100 |
| 5257 |
++++ ltconfig 2004-03-10 15:43:37.000000000 +0100 |
| 5258 |
+@@ -603,6 +603,7 @@ |
| 5259 |
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 5260 |
+ case $host_os in |
| 5261 |
+ linux-gnu*) ;; |
| 5262 |
++linux-uclibc*) ;; |
| 5263 |
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 5264 |
+ esac |
| 5265 |
+ |
| 5266 |
+@@ -1259,6 +1260,25 @@ |
| 5267 |
+ fi |
| 5268 |
+ ;; |
| 5269 |
+ |
| 5270 |
++linux-uclibc*) |
| 5271 |
++ version_type=linux |
| 5272 |
++ need_lib_prefix=no |
| 5273 |
++ need_version=no |
| 5274 |
++ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' |
| 5275 |
++ soname_spec='${libname}${release}.so.$major' |
| 5276 |
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
| 5277 |
++ shlibpath_var=LD_LIBRARY_PATH |
| 5278 |
++ shlibpath_overrides_runpath=no |
| 5279 |
++ deplibs_check_method=pass_all |
| 5280 |
++ # This implies no fast_install, which is unacceptable. |
| 5281 |
++ # Some rework will be needed to allow for fast_install |
| 5282 |
++ # before this can be enabled. |
| 5283 |
++ # Note: copied from linux-gnu, and may not be appropriate. |
| 5284 |
++ hardcode_into_libs=yes |
| 5285 |
++ # Assume using the uClibc dynamic linker. |
| 5286 |
++ dynamic_linker="uClibc ld.so" |
| 5287 |
++ ;; |
| 5288 |
++ |
| 5289 |
+ netbsd* | openbsd*) |
| 5290 |
+ version_type=sunos |
| 5291 |
+ library_names_spec='${libname}${release}.so.$versuffix' |
| 5292 |
|
| 5293 |
diff --git a/eclass/ELT-patches/uclibc-ltconf/1.3.0 b/eclass/ELT-patches/uclibc-ltconf/1.3.0 |
| 5294 |
new file mode 100644 |
| 5295 |
index 0000000..0a5a9ea |
| 5296 |
--- /dev/null |
| 5297 |
+++ b/eclass/ELT-patches/uclibc-ltconf/1.3.0 |
| 5298 |
@@ -0,0 +1,39 @@ |
| 5299 |
+--- ltconfig.uclibc 2004-01-14 22:07:42.000000000 +0100 |
| 5300 |
++++ ltconfig 2004-03-10 15:43:37.000000000 +0100 |
| 5301 |
+@@ -603,6 +603,7 @@ |
| 5302 |
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 5303 |
+ case $host_os in |
| 5304 |
+ linux-gnu*) ;; |
| 5305 |
++linux-uclibc*) ;; |
| 5306 |
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 5307 |
+ esac |
| 5308 |
+ |
| 5309 |
+@@ -1259,6 +1260,28 @@ |
| 5310 |
+ dynamic_linker='GNU/Linux ld.so' |
| 5311 |
+ ;; |
| 5312 |
+ |
| 5313 |
++linux-uclibc*) |
| 5314 |
++ version_type=linux |
| 5315 |
++ need_lib_prefix=no |
| 5316 |
++ need_version=no |
| 5317 |
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' |
| 5318 |
++ soname_spec='${libname}${release}.so$major' |
| 5319 |
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
| 5320 |
++ shlibpath_var=LD_LIBRARY_PATH |
| 5321 |
++ shlibpath_overrides_runpath=no |
| 5322 |
++ # deplibs_check_method=pass_all |
| 5323 |
++ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' |
| 5324 |
++ file_magic_cmd=/usr/bin/file |
| 5325 |
++ file_magic_test_file=`echo /lib/libuClibc-*.so` |
| 5326 |
++ # This implies no fast_install, which is unacceptable. |
| 5327 |
++ # Some rework will be needed to allow for fast_install |
| 5328 |
++ # before this can be enabled. |
| 5329 |
++ # Note: copied from linux-gnu, and may not be appropriate. |
| 5330 |
++ hardcode_into_libs=yes |
| 5331 |
++ # Assume using the uClibc dynamic linker. |
| 5332 |
++ dynamic_linker="uClibc ld.so" |
| 5333 |
++ ;; |
| 5334 |
++ |
| 5335 |
+ netbsd*) |
| 5336 |
+ need_lib_prefix=no |
| 5337 |
+ need_version=no |
| 5338 |
|
| 5339 |
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass |
| 5340 |
new file mode 100644 |
| 5341 |
index 0000000..47ef812 |
| 5342 |
--- /dev/null |
| 5343 |
+++ b/eclass/libtool.eclass |
| 5344 |
@@ -0,0 +1,514 @@ |
| 5345 |
+# Copyright 1999-2014 Gentoo Foundation |
| 5346 |
+# Distributed under the terms of the GNU General Public License v2 |
| 5347 |
+# $Id$ |
| 5348 |
+ |
| 5349 |
+# @ECLASS: libtool.eclass |
| 5350 |
+# @MAINTAINER: |
| 5351 |
+# base-system@g.o |
| 5352 |
+# @BLURB: quickly update bundled libtool code |
| 5353 |
+# @DESCRIPTION: |
| 5354 |
+# This eclass patches ltmain.sh distributed with libtoolized packages with the |
| 5355 |
+# relink and portage patch among others |
| 5356 |
+# |
| 5357 |
+# Note, this eclass does not require libtool as it only applies patches to |
| 5358 |
+# generated libtool files. We do not run the libtoolize program because that |
| 5359 |
+# requires a regeneration of the main autotool files in order to work properly. |
| 5360 |
+ |
| 5361 |
+if [[ -z ${_LIBTOOL_ECLASS} ]]; then |
| 5362 |
+_LIBTOOL_ECLASS=1 |
| 5363 |
+ |
| 5364 |
+# If an overlay has eclass overrides, but doesn't actually override the |
| 5365 |
+# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's |
| 5366 |
+# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So |
| 5367 |
+# add a check to locate the ELT-patches/ regardless of what's going on. |
| 5368 |
+# Note: Duplicated in eutils.eclass. |
| 5369 |
+_LIBTOOL_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} |
| 5370 |
+libtool_elt_patch_dir() { |
| 5371 |
+ local d="${ECLASSDIR}/ELT-patches" |
| 5372 |
+ if [[ ! -d ${d} ]] ; then |
| 5373 |
+ d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches" |
| 5374 |
+ fi |
| 5375 |
+ echo "${d}" |
| 5376 |
+} |
| 5377 |
+ |
| 5378 |
+inherit multilib toolchain-funcs |
| 5379 |
+ |
| 5380 |
+# |
| 5381 |
+# See if we can apply $2 on $1, and if so, do it |
| 5382 |
+# |
| 5383 |
+ELT_try_and_apply_patch() { |
| 5384 |
+ local ret=0 |
| 5385 |
+ local file=$1 |
| 5386 |
+ local patch=$2 |
| 5387 |
+ local src=$3 |
| 5388 |
+ local disp="${src} patch" |
| 5389 |
+ local log="${T}/elibtool.log" |
| 5390 |
+ |
| 5391 |
+ if [[ -z ${_ELT_NOTED_TMP} ]] ; then |
| 5392 |
+ _ELT_NOTED_TMP=true |
| 5393 |
+ printf 'temp patch: %s\n' "${patch}" > "${log}" |
| 5394 |
+ fi |
| 5395 |
+ printf '\nTrying %s\n' "${disp}" >> "${log}" |
| 5396 |
+ |
| 5397 |
+ if [[ ! -e ${file} ]] ; then |
| 5398 |
+ echo "File not found: ${file}" >> "${log}" |
| 5399 |
+ return 1 |
| 5400 |
+ fi |
| 5401 |
+ |
| 5402 |
+ # Save file for permission restoration. `patch` sometimes resets things. |
| 5403 |
+ # Ideally we'd want 'stat -c %a', but stat is highly non portable and we are |
| 5404 |
+ # guaranted to have GNU find, so use that instead. |
| 5405 |
+ local perms="$(find ${file} -maxdepth 0 -printf '%m')" |
| 5406 |
+ # We only support patchlevel of 0 - why worry if its static patches? |
| 5407 |
+ if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then |
| 5408 |
+ einfo " Applying ${disp} ..." |
| 5409 |
+ patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1 |
| 5410 |
+ ret=$? |
| 5411 |
+ export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}" |
| 5412 |
+ else |
| 5413 |
+ ret=1 |
| 5414 |
+ fi |
| 5415 |
+ chmod "${perms}" "${file}" |
| 5416 |
+ |
| 5417 |
+ return "${ret}" |
| 5418 |
+} |
| 5419 |
+ |
| 5420 |
+# |
| 5421 |
+# Get string version of ltmain.sh or ltconfig (passed as $1) |
| 5422 |
+# |
| 5423 |
+ELT_libtool_version() { |
| 5424 |
+ ( |
| 5425 |
+ unset VERSION |
| 5426 |
+ eval $(grep -e '^[[:space:]]*VERSION=' "$1") |
| 5427 |
+ echo "${VERSION:-0}" |
| 5428 |
+ ) |
| 5429 |
+} |
| 5430 |
+ |
| 5431 |
+# |
| 5432 |
+# Run through the patches in $2 and see if any |
| 5433 |
+# apply to $1 ... |
| 5434 |
+# |
| 5435 |
+ELT_walk_patches() { |
| 5436 |
+ local patch tmp |
| 5437 |
+ local ret=1 |
| 5438 |
+ local file=$1 |
| 5439 |
+ local patch_set=$2 |
| 5440 |
+ local patch_dir="$(libtool_elt_patch_dir)/${patch_set}" |
| 5441 |
+ local rem_int_dep=$3 |
| 5442 |
+ |
| 5443 |
+ [[ -z ${patch_set} ]] && return 1 |
| 5444 |
+ [[ ! -d ${patch_dir} ]] && return 1 |
| 5445 |
+ |
| 5446 |
+ # Allow patches to use @GENTOO_LIBDIR@ replacements |
| 5447 |
+ local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ) |
| 5448 |
+ if [[ -n ${rem_int_dep} ]] ; then |
| 5449 |
+ # replace @REM_INT_DEP@ with what was passed |
| 5450 |
+ # to --remove-internal-dep |
| 5451 |
+ sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ) |
| 5452 |
+ fi |
| 5453 |
+ |
| 5454 |
+ pushd "$(libtool_elt_patch_dir)" >/dev/null || die |
| 5455 |
+ |
| 5456 |
+ # Go through the patches in reverse order (newer version to older) |
| 5457 |
+ for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do |
| 5458 |
+ tmp="${T}/libtool-elt.patch" |
| 5459 |
+ sed "${sed_args[@]}" "${patch}" > "${tmp}" || die |
| 5460 |
+ if ELT_try_and_apply_patch "${file}" "${tmp}" "${patch}" ; then |
| 5461 |
+ # Break to unwind w/popd rather than return directly |
| 5462 |
+ ret=0 |
| 5463 |
+ break |
| 5464 |
+ fi |
| 5465 |
+ done |
| 5466 |
+ |
| 5467 |
+ popd >/dev/null |
| 5468 |
+ return ${ret} |
| 5469 |
+} |
| 5470 |
+ |
| 5471 |
+# @FUNCTION: elibtoolize |
| 5472 |
+# @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc] |
| 5473 |
+# @DESCRIPTION: |
| 5474 |
+# Apply a smorgasbord of patches to bundled libtool files. This function |
| 5475 |
+# should always be safe to run. If no directories are specified, then |
| 5476 |
+# ${S} will be searched for appropriate files. |
| 5477 |
+# |
| 5478 |
+# If the --shallow option is used, then only ${S}/ltmain.sh will be patched. |
| 5479 |
+# |
| 5480 |
+# The other options should be avoided in general unless you know what's going on. |
| 5481 |
+elibtoolize() { |
| 5482 |
+ local x |
| 5483 |
+ local dirs=() |
| 5484 |
+ local do_portage="no" |
| 5485 |
+ local do_reversedeps="yes" |
| 5486 |
+ local do_only_patches="no" |
| 5487 |
+ local do_uclibc="yes" |
| 5488 |
+ local deptoremove= |
| 5489 |
+ local do_shallow="no" |
| 5490 |
+ local force="false" |
| 5491 |
+ local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm" |
| 5492 |
+ |
| 5493 |
+ for x in "$@" ; do |
| 5494 |
+ case ${x} in |
| 5495 |
+ --portage) |
| 5496 |
+ # Only apply portage patch, and don't |
| 5497 |
+ # 'libtoolize --copy --force' if all patches fail. |
| 5498 |
+ do_portage="yes" |
| 5499 |
+ ;; |
| 5500 |
+ --reverse-deps) |
| 5501 |
+ # Apply the reverse-deps patch |
| 5502 |
+ # http://bugzilla.gnome.org/show_bug.cgi?id=75635 |
| 5503 |
+ do_reversedeps="yes" |
| 5504 |
+ elt_patches+=" fix-relink" |
| 5505 |
+ ;; |
| 5506 |
+ --patch-only) |
| 5507 |
+ # Do not run libtoolize if none of the patches apply .. |
| 5508 |
+ do_only_patches="yes" |
| 5509 |
+ ;; |
| 5510 |
+ --remove-internal-dep=*) |
| 5511 |
+ # We will replace @REM_INT_DEP@ with what is needed |
| 5512 |
+ # in ELT_walk_patches() ... |
| 5513 |
+ deptoremove=${x#--remove-internal-dep=} |
| 5514 |
+ |
| 5515 |
+ # Add the patch for this ... |
| 5516 |
+ [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep" |
| 5517 |
+ ;; |
| 5518 |
+ --shallow) |
| 5519 |
+ # Only patch the ltmain.sh in ${S} |
| 5520 |
+ do_shallow="yes" |
| 5521 |
+ ;; |
| 5522 |
+ --no-uclibc) |
| 5523 |
+ do_uclibc="no" |
| 5524 |
+ ;; |
| 5525 |
+ --force) |
| 5526 |
+ force="true" |
| 5527 |
+ ;; |
| 5528 |
+ -*) |
| 5529 |
+ eerror "Invalid elibtoolize option: ${x}" |
| 5530 |
+ die "elibtoolize called with ${x} ??" |
| 5531 |
+ ;; |
| 5532 |
+ *) dirs+=( "${x}" ) |
| 5533 |
+ esac |
| 5534 |
+ done |
| 5535 |
+ |
| 5536 |
+ [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf" |
| 5537 |
+ |
| 5538 |
+ case ${CHOST} in |
| 5539 |
+ *-aix*) elt_patches+=" hardcode aixrtl" ;; #213277 |
| 5540 |
+ *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;; |
| 5541 |
+ *-solaris*) elt_patches+=" sol2-conf sol2-ltmain" ;; |
| 5542 |
+ *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;; |
| 5543 |
+ *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;; |
| 5544 |
+ *-irix*) elt_patches+=" irix-ltmain" ;; |
| 5545 |
+ *-mint*) elt_patches+=" mint-conf" ;; |
| 5546 |
+ esac |
| 5547 |
+ |
| 5548 |
+ if $(tc-getLD) --version 2>&1 | grep -qs 'GNU gold'; then |
| 5549 |
+ elt_patches+=" gold-conf" |
| 5550 |
+ fi |
| 5551 |
+ |
| 5552 |
+ # Find out what dirs to scan. |
| 5553 |
+ if [[ ${do_shallow} == "yes" ]] ; then |
| 5554 |
+ [[ ${#dirs[@]} -ne 0 ]] && die "Using --shallow with explicit dirs doesn't make sense" |
| 5555 |
+ [[ -f ${S}/ltmain.sh || -f ${S}/configure ]] && dirs+=( "${S}" ) |
| 5556 |
+ else |
| 5557 |
+ [[ ${#dirs[@]} -eq 0 ]] && dirs+=( "${S}" ) |
| 5558 |
+ dirs=( $(find "${dirs[@]}" '(' -name ltmain.sh -o -name configure ')' -printf '%h\n' | sort -u) ) |
| 5559 |
+ fi |
| 5560 |
+ |
| 5561 |
+ local d p ret |
| 5562 |
+ for d in "${dirs[@]}" ; do |
| 5563 |
+ export ELT_APPLIED_PATCHES= |
| 5564 |
+ |
| 5565 |
+ if [[ -f ${d}/.elibtoolized ]] ; then |
| 5566 |
+ ${force} || continue |
| 5567 |
+ fi |
| 5568 |
+ |
| 5569 |
+ local outfunc="einfo" |
| 5570 |
+ [[ -f ${d}/.elibtoolized ]] && outfunc="ewarn" |
| 5571 |
+ ${outfunc} "Running elibtoolize in: ${d#${WORKDIR}/}/" |
| 5572 |
+ if [[ ${outfunc} == "ewarn" ]] ; then |
| 5573 |
+ ewarn " We've already been run in this tree; you should" |
| 5574 |
+ ewarn " avoid this if possible (perhaps by filing a bug)" |
| 5575 |
+ fi |
| 5576 |
+ |
| 5577 |
+ # patching ltmain.sh |
| 5578 |
+ [[ -f ${d}/ltmain.sh ]] && |
| 5579 |
+ for p in ${elt_patches} ; do |
| 5580 |
+ ret=0 |
| 5581 |
+ |
| 5582 |
+ case ${p} in |
| 5583 |
+ portage) |
| 5584 |
+ # Stupid test to see if its already applied ... |
| 5585 |
+ if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then |
| 5586 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5587 |
+ ret=$? |
| 5588 |
+ fi |
| 5589 |
+ ;; |
| 5590 |
+ rem-int-dep) |
| 5591 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}" |
| 5592 |
+ ret=$? |
| 5593 |
+ ;; |
| 5594 |
+ fix-relink) |
| 5595 |
+ # Do not apply if we do not have the relink patch applied ... |
| 5596 |
+ if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then |
| 5597 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5598 |
+ ret=$? |
| 5599 |
+ fi |
| 5600 |
+ ;; |
| 5601 |
+ max_cmd_len) |
| 5602 |
+ # Do not apply if $max_cmd_len is not used ... |
| 5603 |
+ if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then |
| 5604 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5605 |
+ ret=$? |
| 5606 |
+ fi |
| 5607 |
+ ;; |
| 5608 |
+ as-needed) |
| 5609 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5610 |
+ ret=$? |
| 5611 |
+ ;; |
| 5612 |
+ uclibc-ltconf) |
| 5613 |
+ # Newer libtoolize clears ltconfig, as not used anymore |
| 5614 |
+ if [[ -s ${d}/ltconfig ]] ; then |
| 5615 |
+ ELT_walk_patches "${d}/ltconfig" "${p}" |
| 5616 |
+ ret=$? |
| 5617 |
+ fi |
| 5618 |
+ ;; |
| 5619 |
+ fbsd-ltconf) |
| 5620 |
+ if [[ -s ${d}/ltconfig ]] ; then |
| 5621 |
+ ELT_walk_patches "${d}/ltconfig" "${p}" |
| 5622 |
+ ret=$? |
| 5623 |
+ fi |
| 5624 |
+ ;; |
| 5625 |
+ darwin-ltconf) |
| 5626 |
+ # Newer libtoolize clears ltconfig, as not used anymore |
| 5627 |
+ if [[ -s ${d}/ltconfig ]] ; then |
| 5628 |
+ ELT_walk_patches "${d}/ltconfig" "${p}" |
| 5629 |
+ ret=$? |
| 5630 |
+ fi |
| 5631 |
+ ;; |
| 5632 |
+ darwin-ltmain) |
| 5633 |
+ # special case to avoid false positives (failing to apply |
| 5634 |
+ # ltmain.sh path message), newer libtools have this patch |
| 5635 |
+ # built in, so not much to patch around then |
| 5636 |
+ if [[ -e ${d}/ltmain.sh ]] && \ |
| 5637 |
+ ! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then |
| 5638 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5639 |
+ ret=$? |
| 5640 |
+ fi |
| 5641 |
+ ;; |
| 5642 |
+ install-sh) |
| 5643 |
+ ELT_walk_patches "${d}/install-sh" "${p}" |
| 5644 |
+ ret=$? |
| 5645 |
+ ;; |
| 5646 |
+ cross) |
| 5647 |
+ if tc-is-cross-compiler ; then |
| 5648 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5649 |
+ ret=$? |
| 5650 |
+ fi |
| 5651 |
+ ;; |
| 5652 |
+ *) |
| 5653 |
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" |
| 5654 |
+ ret=$? |
| 5655 |
+ ;; |
| 5656 |
+ esac |
| 5657 |
+ |
| 5658 |
+ if [[ ${ret} -ne 0 ]] ; then |
| 5659 |
+ case ${p} in |
| 5660 |
+ relink) |
| 5661 |
+ local version=$(ELT_libtool_version "${d}/ltmain.sh") |
| 5662 |
+ # Critical patch, but could be applied ... |
| 5663 |
+ # FIXME: Still need a patch for ltmain.sh > 1.4.0 |
| 5664 |
+ if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \ |
| 5665 |
+ [[ $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then |
| 5666 |
+ ewarn " Could not apply relink.patch!" |
| 5667 |
+ fi |
| 5668 |
+ ;; |
| 5669 |
+ portage) |
| 5670 |
+ # Critical patch - for this one we abort, as it can really |
| 5671 |
+ # cause breakage without it applied! |
| 5672 |
+ if [[ ${do_portage} == "yes" ]] ; then |
| 5673 |
+ # Stupid test to see if its already applied ... |
| 5674 |
+ if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then |
| 5675 |
+ echo |
| 5676 |
+ eerror "Portage patch requested, but failed to apply!" |
| 5677 |
+ eerror "Please file a bug report to add a proper patch." |
| 5678 |
+ die "Portage patch requested, but failed to apply!" |
| 5679 |
+ fi |
| 5680 |
+ else |
| 5681 |
+ if grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then |
| 5682 |
+ # ewarn " Portage patch seems to be already applied." |
| 5683 |
+ # ewarn " Please verify that it is not needed." |
| 5684 |
+ : |
| 5685 |
+ else |
| 5686 |
+ local version=$(ELT_libtool_version "${d}"/ltmain.sh) |
| 5687 |
+ echo |
| 5688 |
+ eerror "Portage patch failed to apply (ltmain.sh version ${version})!" |
| 5689 |
+ eerror "Please file a bug report to add a proper patch." |
| 5690 |
+ die "Portage patch failed to apply!" |
| 5691 |
+ fi |
| 5692 |
+ # We do not want to run libtoolize ... |
| 5693 |
+ ELT_APPLIED_PATCHES="portage" |
| 5694 |
+ fi |
| 5695 |
+ ;; |
| 5696 |
+ darwin-*) |
| 5697 |
+ [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!" |
| 5698 |
+ ;; |
| 5699 |
+ esac |
| 5700 |
+ fi |
| 5701 |
+ done |
| 5702 |
+ |
| 5703 |
+ # makes sense for ltmain.sh patches only |
| 5704 |
+ [[ -f ${d}/ltmain.sh ]] && |
| 5705 |
+ if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then |
| 5706 |
+ if [[ ${do_portage} == "no" && \ |
| 5707 |
+ ${do_reversedeps} == "no" && \ |
| 5708 |
+ ${do_only_patches} == "no" && \ |
| 5709 |
+ ${deptoremove} == "" ]] |
| 5710 |
+ then |
| 5711 |
+ ewarn "Cannot apply any patches, please file a bug about this" |
| 5712 |
+ die |
| 5713 |
+ fi |
| 5714 |
+ fi |
| 5715 |
+ |
| 5716 |
+ # patching configure |
| 5717 |
+ [[ -f ${d}/configure ]] && |
| 5718 |
+ for p in ${elt_patches} ; do |
| 5719 |
+ ret=0 |
| 5720 |
+ |
| 5721 |
+ case ${p} in |
| 5722 |
+ uclibc-conf) |
| 5723 |
+ if grep -qs 'Transform linux' "${d}/configure" ; then |
| 5724 |
+ ELT_walk_patches "${d}/configure" "${p}" |
| 5725 |
+ ret=$? |
| 5726 |
+ fi |
| 5727 |
+ ;; |
| 5728 |
+ fbsd-conf) |
| 5729 |
+ if grep -qs 'version_type=freebsd-' "${d}/configure" ; then |
| 5730 |
+ ELT_walk_patches "${d}/configure" "${p}" |
| 5731 |
+ ret=$? |
| 5732 |
+ fi |
| 5733 |
+ ;; |
| 5734 |
+ darwin-conf) |
| 5735 |
+ if grep -qs '&& echo \.so ||' "${d}/configure" ; then |
| 5736 |
+ ELT_walk_patches "${d}/configure" "${p}" |
| 5737 |
+ ret=$? |
| 5738 |
+ fi |
| 5739 |
+ ;; |
| 5740 |
+ aixrtl|hpux-conf) |
| 5741 |
+ ret=1 |
| 5742 |
+ local subret=0 |
| 5743 |
+ # apply multiple patches as often as they match |
| 5744 |
+ while [[ $subret -eq 0 ]]; do |
| 5745 |
+ subret=1 |
| 5746 |
+ if [[ -e ${d}/configure ]]; then |
| 5747 |
+ ELT_walk_patches "${d}/configure" "${p}" |
| 5748 |
+ subret=$? |
| 5749 |
+ fi |
| 5750 |
+ if [[ $subret -eq 0 ]]; then |
| 5751 |
+ # have at least one patch succeeded. |
| 5752 |
+ ret=0 |
| 5753 |
+ fi |
| 5754 |
+ done |
| 5755 |
+ ;; |
| 5756 |
+ mint-conf|gold-conf|sol2-conf) |
| 5757 |
+ ELT_walk_patches "${d}/configure" "${p}" |
| 5758 |
+ ret=$? |
| 5759 |
+ ;; |
| 5760 |
+ target-nm) |
| 5761 |
+ ELT_walk_patches "${d}/configure" "${p}" |
| 5762 |
+ ret=$? |
| 5763 |
+ ;; |
| 5764 |
+ *) |
| 5765 |
+ # ltmain.sh patches are applied above |
| 5766 |
+ ;; |
| 5767 |
+ esac |
| 5768 |
+ |
| 5769 |
+ if [[ ${ret} -ne 0 ]] ; then |
| 5770 |
+ case ${p} in |
| 5771 |
+ uclibc-*) |
| 5772 |
+ [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!" |
| 5773 |
+ ;; |
| 5774 |
+ fbsd-*) |
| 5775 |
+ if [[ ${CHOST} == *-freebsd* ]] ; then |
| 5776 |
+ if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \ |
| 5777 |
+ "${d}/configure" 2>/dev/null) ]]; then |
| 5778 |
+ eerror " FreeBSD patch set '${p}' failed to apply!" |
| 5779 |
+ die "FreeBSD patch set '${p}' failed to apply!" |
| 5780 |
+ fi |
| 5781 |
+ fi |
| 5782 |
+ ;; |
| 5783 |
+ darwin-*) |
| 5784 |
+ [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!" |
| 5785 |
+ ;; |
| 5786 |
+ esac |
| 5787 |
+ fi |
| 5788 |
+ done |
| 5789 |
+ |
| 5790 |
+ rm -f "${d}/libtool" |
| 5791 |
+ |
| 5792 |
+ > "${d}/.elibtoolized" |
| 5793 |
+ done |
| 5794 |
+} |
| 5795 |
+ |
| 5796 |
+uclibctoolize() { die "Use elibtoolize"; } |
| 5797 |
+darwintoolize() { die "Use elibtoolize"; } |
| 5798 |
+ |
| 5799 |
+# char *VER_major(string) |
| 5800 |
+# |
| 5801 |
+# Return the Major (X of X.Y.Z) version |
| 5802 |
+# |
| 5803 |
+VER_major() { |
| 5804 |
+ [[ -z $1 ]] && return 1 |
| 5805 |
+ |
| 5806 |
+ local VER=$@ |
| 5807 |
+ echo "${VER%%[^[:digit:]]*}" |
| 5808 |
+} |
| 5809 |
+ |
| 5810 |
+# char *VER_minor(string) |
| 5811 |
+# |
| 5812 |
+# Return the Minor (Y of X.Y.Z) version |
| 5813 |
+# |
| 5814 |
+VER_minor() { |
| 5815 |
+ [[ -z $1 ]] && return 1 |
| 5816 |
+ |
| 5817 |
+ local VER=$@ |
| 5818 |
+ VER=${VER#*.} |
| 5819 |
+ echo "${VER%%[^[:digit:]]*}" |
| 5820 |
+} |
| 5821 |
+ |
| 5822 |
+# char *VER_micro(string) |
| 5823 |
+# |
| 5824 |
+# Return the Micro (Z of X.Y.Z) version. |
| 5825 |
+# |
| 5826 |
+VER_micro() { |
| 5827 |
+ [[ -z $1 ]] && return 1 |
| 5828 |
+ |
| 5829 |
+ local VER=$@ |
| 5830 |
+ VER=${VER#*.*.} |
| 5831 |
+ echo "${VER%%[^[:digit:]]*}" |
| 5832 |
+} |
| 5833 |
+ |
| 5834 |
+# int VER_to_int(string) |
| 5835 |
+# |
| 5836 |
+# Convert a string type version (2.4.0) to an int (132096) |
| 5837 |
+# for easy compairing or versions ... |
| 5838 |
+# |
| 5839 |
+VER_to_int() { |
| 5840 |
+ [[ -z $1 ]] && return 1 |
| 5841 |
+ |
| 5842 |
+ local VER_MAJOR=$(VER_major "$1") |
| 5843 |
+ local VER_MINOR=$(VER_minor "$1") |
| 5844 |
+ local VER_MICRO=$(VER_micro "$1") |
| 5845 |
+ local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO )) |
| 5846 |
+ |
| 5847 |
+ # We make version 1.0.0 the minimum version we will handle as |
| 5848 |
+ # a sanity check ... if its less, we fail ... |
| 5849 |
+ if [[ ${VER_int} -ge 65536 ]] ; then |
| 5850 |
+ echo "${VER_int}" |
| 5851 |
+ return 0 |
| 5852 |
+ fi |
| 5853 |
+ |
| 5854 |
+ echo 1 |
| 5855 |
+ return 1 |
| 5856 |
+} |
| 5857 |
+ |
| 5858 |
+fi |
Archives