mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 21:11:08 +02:00
bump(eclass): sync with upstream
Packages updated: eclass licenses scripts
This commit is contained in:
David Michael
parent
03acc36304
commit
72d7451e2f
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -7234,7 +7235,7 @@
|
|
||||||
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
- 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"
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -10041,7 +10043,7 @@
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
|
|
||||||
- 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"
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -7113,9 +7113,9 @@
|
|
||||||
# If we're using GNU nm, then we don't want the "-C" option.
|
|
||||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
|
||||||
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
fi
|
|
||||||
aix_use_runtimelinking=no
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -11217,9 +11217,9 @@
|
|
||||||
# If we're using GNU nm, then we don't want the "-C" option.
|
|
||||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
|
||||||
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
pw32*)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -7189,7 +7190,7 @@
|
|
||||||
if test "$aix_use_runtimelinking" = yes; then
|
|
||||||
# Warning - without using the other runtime loading flags (-brtl),
|
|
||||||
# -berok will link without error, but may produce a broken library.
|
|
||||||
- allow_undefined_flag='-berok'
|
|
||||||
+ no_undefined_flag=' ${wl}-bernotok'
|
|
||||||
# Determine the default libpath from the value encoded in an empty executable.
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
#line $LINENO "configure"
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -9995,7 +9997,7 @@
|
|
||||||
if test "$aix_use_runtimelinking" = yes; then
|
|
||||||
# Warning - without using the other runtime loading flags (-brtl),
|
|
||||||
# -berok will link without error, but may produce a broken library.
|
|
||||||
- allow_undefined_flag_CXX='-berok'
|
|
||||||
+ no_undefined_flag_CXX=' ${wl}-bernotok'
|
|
||||||
# Determine the default libpath from the value encoded in an empty executable.
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
#line $LINENO "configure"
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -14426,7 +14426,8 @@
|
|
||||||
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
|
|
||||||
# instead of lib<name>.a to let people know that these are not
|
|
||||||
# typical AIX shared libraries.
|
|
||||||
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
||||||
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
|
|
||||||
+ [ "${OBJECT_MODE:-32}" = '64' ] && soname_spec='$libname$release$shared_ext$major(shr_64.o)' || soname_spec='$libname$release$shared_ext$major(shr.o)'
|
|
||||||
else
|
|
||||||
# We preserve .a as extension for shared libraries through AIX4.2
|
|
||||||
# and later when we are not doing run time linking.
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -7130,6 +7130,7 @@
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
esac
|
|
||||||
+ aix_use_runtimelinking=yes
|
|
||||||
|
|
||||||
exp_sym_flag='-bexport'
|
|
||||||
no_entry_flag='-bnoentry'
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -9936,6 +9937,7 @@
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
esac
|
|
||||||
+ aix_use_runtimelinking=yes
|
|
||||||
|
|
||||||
exp_sym_flag='-bexport'
|
|
||||||
no_entry_flag='-bnoentry'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -8679,7 +8679,7 @@
|
|
||||||
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
||||||
+ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -11731,7 +11731,7 @@
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
|
|
||||||
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
||||||
+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -1,6 +1,9 @@
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
# AIX 5 now supports IA64 processor
|
|
||||||
lt_prog_compiler_static='-Bstatic'
|
|
||||||
+ lt_prog_compiler_pic='-fPIC'
|
|
||||||
+ else
|
|
||||||
+ lt_prog_compiler_pic='-fPIC'
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -1,6 +1,9 @@
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
# AIX 5 now supports IA64 processor
|
|
||||||
lt_prog_compiler_static_CXX='-Bstatic'
|
|
||||||
+ lt_prog_compiler_pic_CXX='-fPIC'
|
|
||||||
+ else
|
|
||||||
+ lt_prog_compiler_pic_CXX='-fPIC'
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -8619,7 +8619,7 @@
|
|
||||||
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -13946,7 +13947,7 @@
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
|
|
||||||
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
||||||
+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -8475,9 +8475,9 @@
|
|
||||||
# If we're using GNU nm, then we don't want the "-C" option.
|
|
||||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
|
||||||
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
fi
|
|
||||||
aix_use_runtimelinking=no
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -15506,9 +15506,9 @@
|
|
||||||
# If we're using GNU nm, then we don't want the "-C" option.
|
|
||||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
|
||||||
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
pw32*)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -8558,7 +8558,7 @@
|
|
||||||
if test "$aix_use_runtimelinking" = yes; then
|
|
||||||
# Warning - without using the other runtime loading flags (-brtl),
|
|
||||||
# -berok will link without error, but may produce a broken library.
|
|
||||||
- allow_undefined_flag='-berok'
|
|
||||||
+ no_undefined_flag=' ${wl}-bernotok'
|
|
||||||
# Determine the default libpath from the value encoded in an
|
|
||||||
# empty executable.
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -13884,7 +13885,7 @@
|
|
||||||
if test "$aix_use_runtimelinking" = yes; then
|
|
||||||
# Warning - without using the other runtime loading flags (-brtl),
|
|
||||||
# -berok will link without error, but may produce a broken library.
|
|
||||||
- allow_undefined_flag_CXX='-berok'
|
|
||||||
+ no_undefined_flag_CXX=' ${wl}-bernotok'
|
|
||||||
# Determine the default libpath from the value encoded in an empty
|
|
||||||
# executable.
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -13819,6 +13819,7 @@
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
+ aix_use_runtimelinking=yes
|
|
||||||
|
|
||||||
exp_sym_flag='-bexport'
|
|
||||||
no_entry_flag='-bnoentry'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -9214,7 +9214,7 @@
|
|
||||||
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
||||||
+ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -13307,7 +13307,7 @@
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
|
|
||||||
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
||||||
+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -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'
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -9660,9 +9660,9 @@
|
|
||||||
# Also, AIX nm treats weak defined symbols like other global
|
|
||||||
# defined symbols, whereas GNU nm marks them as "W".
|
|
||||||
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
fi
|
|
||||||
aix_use_runtimelinking=no
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -15711,9 +15711,9 @@
|
|
||||||
# Also, AIX nm treats weak defined symbols like other global defined
|
|
||||||
# symbols, whereas GNU nm marks them as "W".
|
|
||||||
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
else
|
|
||||||
- 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'
|
|
||||||
+ 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'
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
pw32*)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -9214,7 +9214,7 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
|
|
||||||
+ archive_expsym_cmds='eval `echo "$soname" | $SED -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d'
|
|
||||||
else
|
|
||||||
if test ia64 = "$host_cpu"; then
|
|
||||||
hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -13307,7 +13307,7 @@
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
|
|
||||||
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
|
|
||||||
+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d'
|
|
||||||
else
|
|
||||||
if test ia64 = "$host_cpu"; then
|
|
||||||
hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -14426,6 +14426,7 @@
|
|
||||||
# instead of lib<name>.a to let people know that these are not
|
|
||||||
# typical AIX shared libraries.
|
|
||||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
|
||||||
+ [ "${OBJECT_MODE:-32}" = '64' ] && soname_spec='$libname$release$shared_ext$major(shr_64.o)' || soname_spec='$libname$release$shared_ext$major(shr.o)'
|
|
||||||
else
|
|
||||||
# We preserve .a as extension for shared libraries through AIX4.2
|
|
||||||
# and later when we are not doing run time linking.
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -10835,7 +10835,7 @@
|
|
||||||
if ${lt_cv_with_aix_soname+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
- lt_cv_with_aix_soname=aix
|
|
||||||
+ lt_cv_with_aix_soname=svr4
|
|
||||||
fi
|
|
||||||
|
|
||||||
with_aix_soname=$lt_cv_with_aix_soname
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
--- ltmain.sh.orig 2006-03-29 15:45:36.000000000 +0200
|
|
||||||
+++ ltmain.sh 2006-03-29 16:39:30.000000000 +0200
|
|
||||||
@@ -1754,6 +1754,11 @@
|
|
||||||
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-Wl,*)
|
|
||||||
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
|
||||||
arg=
|
|
||||||
@@ -2094,6 +2099,15 @@
|
|
||||||
lib=
|
|
||||||
found=no
|
|
||||||
case $deplib in
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
--- ltmain.sh.orig 2009-04-18 16:51:52.000000000 +0200
|
|
||||||
+++ ltmain.sh 2009-04-18 16:55:05.000000000 +0200
|
|
||||||
@@ -1812,10 +1812,15 @@
|
|
||||||
done
|
|
||||||
IFS="$save_ifs"
|
|
||||||
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-Wl,*)
|
|
||||||
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
|
||||||
arg=
|
|
||||||
save_ifs="$IFS"; IFS=','
|
|
||||||
for flag in $args; do
|
|
||||||
@@ -2152,10 +2157,19 @@
|
|
||||||
fi
|
|
||||||
for deplib in $libs; do
|
|
||||||
lib=
|
|
||||||
found=no
|
|
||||||
case $deplib in
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
else
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
--- ltmain.sh.orig 2009-04-18 14:37:16.000000000 +0200
|
|
||||||
+++ ltmain.sh 2009-04-18 14:40:08.000000000 +0200
|
|
||||||
@@ -4721,10 +4721,15 @@
|
|
||||||
IFS="$save_ifs"
|
|
||||||
func_stripname ' ' '' "$arg"
|
|
||||||
arg=$func_stripname_result
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-Wl,*)
|
|
||||||
func_stripname '-Wl,' '' "$arg"
|
|
||||||
args=$func_stripname_result
|
|
||||||
arg=
|
|
||||||
save_ifs="$IFS"; IFS=','
|
|
||||||
@@ -5075,10 +5080,19 @@
|
|
||||||
|
|
||||||
for deplib in $libs; do
|
|
||||||
lib=
|
|
||||||
found=no
|
|
||||||
case $deplib in
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
else
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
--- ltmain.sh.orig 2012-08-19 10:18:57.929178597 +0200
|
|
||||||
+++ ltmain.sh 2012-08-19 10:31:43.409388998 +0200
|
|
||||||
@@ -5798,10 +5798,15 @@
|
|
||||||
IFS="$save_ifs"
|
|
||||||
func_stripname ' ' '' "$arg"
|
|
||||||
arg=$func_stripname_result
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-Wl,*)
|
|
||||||
func_stripname '-Wl,' '' "$arg"
|
|
||||||
args=$func_stripname_result
|
|
||||||
arg=
|
|
||||||
save_ifs="$IFS"; IFS=','
|
|
||||||
@@ -6158,10 +6163,19 @@
|
|
||||||
|
|
||||||
for deplib in $libs; do
|
|
||||||
lib=
|
|
||||||
found=no
|
|
||||||
case $deplib in
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
|
||||||
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -7225,10 +7225,15 @@
|
|
||||||
IFS=$save_ifs
|
|
||||||
func_stripname ' ' '' "$arg"
|
|
||||||
arg=$func_stripname_result
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ deplibs="$deplibs $arg"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
-Wl,*)
|
|
||||||
func_stripname '-Wl,' '' "$arg"
|
|
||||||
args=$func_stripname_result
|
|
||||||
arg=
|
|
||||||
save_ifs=$IFS; IFS=,
|
|
||||||
@@ -7609,10 +7614,19 @@
|
|
||||||
|
|
||||||
for deplib in $libs; do
|
|
||||||
lib=
|
|
||||||
found=false
|
|
||||||
case $deplib in
|
|
||||||
+ -Wl,--as-needed|-Wl,--no-as-needed)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
|
||||||
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
|
||||||
if test prog,link = "$linkmode,$pass"; then
|
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -5768,7 +5768,7 @@
|
|
||||||
test "$hardcode_direct_absolute" = no; then
|
|
||||||
add="$libdir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ add_dir="-L${SYSROOT}$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
case :$finalize_shlibpath: in
|
|
||||||
@@ -5785,7 +5785,7 @@
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ add_dir="-L${SYSROOT}/$libdir"
|
|
||||||
# Try looking first in the location we're being installed to.
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
|
||||||
case $libdir in
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -5768,7 +5768,7 @@
|
|
||||||
test "$hardcode_direct_absolute" = no; then
|
|
||||||
add="$libdir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ add_dir="-L${lt_sysroot:-${SYSROOT}}$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
case :$finalize_shlibpath: in
|
|
||||||
@@ -5785,7 +5785,7 @@
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ add_dir="-L${lt_sysroot:-${SYSROOT}}/$libdir"
|
|
||||||
# Try looking first in the location we're being installed to.
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
|
||||||
case $libdir in
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -8367,7 +8367,7 @@
|
|
||||||
test no = "$hardcode_direct_absolute"; then
|
|
||||||
add=$libdir/$linklib
|
|
||||||
elif test yes = "$hardcode_minus_L"; then
|
|
||||||
- add_dir=-L$libdir
|
|
||||||
+ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir
|
|
||||||
add=-l$name
|
|
||||||
elif test yes = "$hardcode_shlibpath_var"; then
|
|
||||||
case :$finalize_shlibpath: in
|
|
||||||
@@ -8384,7 +8384,7 @@
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
- add_dir=-L$libdir
|
|
||||||
+ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir
|
|
||||||
# Try looking first in the location we're being installed to.
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
|
||||||
case $libdir in
|
|
||||||
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
In Gentoo Prefix we go by Apple's convention to give modules the .bundle
|
|
||||||
extension.
|
|
||||||
http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html
|
|
||||||
(Above link was removed by Apple, the link below contains a copy:
|
|
||||||
http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html,
|
|
||||||
in case it disappears also, the relevant quote:
|
|
||||||
|
|
||||||
Bundle. Bundles are executable files that can be loaded at runtime by
|
|
||||||
other products. Plug-ins are implemented using bundles. The term bundle
|
|
||||||
in this context refers to the binary itself, not to a structured
|
|
||||||
hierarchy. Bundles have the .bundle extension; for example,
|
|
||||||
MyBundle.bundle.)
|
|
||||||
|
|
||||||
--- configure.orig 2009-05-22 12:05:31 +0200
|
|
||||||
+++ configure 2009-05-22 12:05:39 +0200
|
|
||||||
@@ -15461,7 +15461,7 @@
|
|
||||||
soname_spec='${libname}${release}${major}$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
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"`
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
In Gentoo Prefix we go by Apple's convention to give modules the .bundle
|
|
||||||
extension.
|
|
||||||
http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html
|
|
||||||
(Above link was removed by Apple, the link below contains a copy:
|
|
||||||
http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html,
|
|
||||||
in case it disappears also, the relevant quote:
|
|
||||||
|
|
||||||
Bundle. Bundles are executable files that can be loaded at runtime by
|
|
||||||
other products. Plug-ins are implemented using bundles. The term bundle
|
|
||||||
in this context refers to the binary itself, not to a structured
|
|
||||||
hierarchy. Bundles have the .bundle extension; for example,
|
|
||||||
MyBundle.bundle.)
|
|
||||||
|
|
||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -10570,7 +10570,7 @@
|
|
||||||
soname_spec='${libname}${release}${major}$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
|
|
||||||
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
|
|
||||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
||||||
@@ -14213,7 +14213,7 @@
|
|
||||||
soname_spec='${libname}${release}${major}$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
|
|
||||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
||||||
;;
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
In Gentoo Prefix we go by Apple's convention to give modules the .bundle
|
|
||||||
extension.
|
|
||||||
http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html
|
|
||||||
(Above link was removed by Apple, the link below contains a copy:
|
|
||||||
http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html,
|
|
||||||
in case it disappears also, the relevant quote:
|
|
||||||
|
|
||||||
Bundle. Bundles are executable files that can be loaded at runtime by
|
|
||||||
other products. Plug-ins are implemented using bundles. The term bundle
|
|
||||||
in this context refers to the binary itself, not to a structured
|
|
||||||
hierarchy. Bundles have the .bundle extension; for example,
|
|
||||||
MyBundle.bundle.)
|
|
||||||
|
|
||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -12172,11 +12172,11 @@
|
|
||||||
version_type=darwin
|
|
||||||
need_lib_prefix=no
|
|
||||||
need_version=no
|
|
||||||
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
|
||||||
+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
|
||||||
soname_spec='${libname}${release}${major}$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
|
|
||||||
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
|
|
||||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
In Gentoo Prefix we go by Apple's convention to give modules the .bundle
|
|
||||||
extension.
|
|
||||||
http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html
|
|
||||||
(Above link was removed by Apple, the link below contains a copy:
|
|
||||||
http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html,
|
|
||||||
in case it disappears also, the relevant quote:
|
|
||||||
|
|
||||||
Bundle. Bundles are executable files that can be loaded at runtime by
|
|
||||||
other products. Plug-ins are implemented using bundles. The term bundle
|
|
||||||
in this context refers to the binary itself, not to a structured
|
|
||||||
hierarchy. Bundles have the .bundle extension; for example,
|
|
||||||
MyBundle.bundle.)
|
|
||||||
|
|
||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -11455,11 +11455,11 @@
|
|
||||||
version_type=darwin
|
|
||||||
need_lib_prefix=no
|
|
||||||
need_version=no
|
|
||||||
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
|
||||||
+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
|
||||||
soname_spec='${libname}${release}${major}$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
|
|
||||||
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
|
|
||||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
||||||
@@ -15321,11 +15331,11 @@
|
|
||||||
version_type=darwin
|
|
||||||
need_lib_prefix=no
|
|
||||||
need_version=no
|
|
||||||
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
|
||||||
+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
|
||||||
soname_spec='${libname}${release}${major}$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
|
|
||||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
||||||
;;
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
In Gentoo Prefix we go by Apple's convention to give modules the .bundle
|
|
||||||
extension.
|
|
||||||
http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html
|
|
||||||
(Above link was removed by Apple, the link below contains a copy:
|
|
||||||
http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html,
|
|
||||||
in case it disappears also, the relevant quote:
|
|
||||||
|
|
||||||
Bundle. Bundles are executable files that can be loaded at runtime by
|
|
||||||
other products. Plug-ins are implemented using bundles. The term bundle
|
|
||||||
in this context refers to the binary itself, not to a structured
|
|
||||||
hierarchy. Bundles have the .bundle extension; for example,
|
|
||||||
MyBundle.bundle.)
|
|
||||||
|
|
||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -13108,11 +13108,11 @@
|
|
||||||
version_type=darwin
|
|
||||||
need_lib_prefix=no
|
|
||||||
need_version=no
|
|
||||||
- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
|
|
||||||
+ library_names_spec='${libname}${release}${versuffix}$shared_ext $libname$release$major$shared_ext $libname$shared_ext'
|
|
||||||
soname_spec='$libname$release$major$shared_ext'
|
|
||||||
shlibpath_overrides_runpath=yes
|
|
||||||
shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
||||||
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
|
|
||||||
|
|
||||||
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
|
|
||||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
--- ltconfig-1.2 Wed May 19 09:17:36 1999
|
|
||||||
+++ ltconfig Wed Oct 6 14:29:08 2004
|
|
||||||
@@ -459,6 +459,11 @@
|
|
||||||
os2*)
|
|
||||||
# We can build DLLs from non-PIC.
|
|
||||||
;;
|
|
||||||
+ darwin* | rhapsody*)
|
|
||||||
+ # PIC is the default on this platform
|
|
||||||
+ # Common symbols not allowed in MH_DYLIB files
|
|
||||||
+ pic_flag='-fno-common'
|
|
||||||
+ ;;
|
|
||||||
amigaos*)
|
|
||||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
|
||||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
|
||||||
@@ -785,6 +790,23 @@
|
|
||||||
hardcode_shlibpath_var=no
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ darwin* | rhapsody*)
|
|
||||||
+ case "$host_os" in
|
|
||||||
+ rhapsody* | darwin1.[012])
|
|
||||||
+ allow_undefined_flag='-undefined suppress'
|
|
||||||
+ ;;
|
|
||||||
+ *) # Darwin 1.3 on
|
|
||||||
+ allow_undefined_flag='-flat_namespace -undefined suppress'
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ 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)'
|
|
||||||
+ # We need to add '_' to the symbols in $export_symbols first
|
|
||||||
+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
|
|
||||||
+ hardcode_direct=yes
|
|
||||||
+ hardcode_shlibpath_var=no
|
|
||||||
+ whole_archive_flag_spec='-all_load $convenience'
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
hpux9*)
|
|
||||||
archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib'
|
|
||||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
|
||||||
@@ -1134,6 +1156,27 @@
|
|
||||||
version_type=sunos
|
|
||||||
library_names_spec='${libname}${release}.so.$versuffix'
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+darwin* | rhapsody*)
|
|
||||||
+ dynamic_linker="$host_os dyld"
|
|
||||||
+ version_type=darwin
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ deplibs_check_method='file_magic Mach-O dynamically linked shared library'
|
|
||||||
+ file_magic_cmd='/usr/bin/file -L'
|
|
||||||
+ case "$host_os" in
|
|
||||||
+ rhapsody* | darwin1.[012])
|
|
||||||
+ file_magic_test_file='/System/Library/Frameworks/System.framework/System'
|
|
||||||
+ ;;
|
|
||||||
+ *) # Darwin 1.3 on
|
|
||||||
+ file_magic_test_file='/usr/lib/libSystem.dylib'
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ 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)'
|
|
||||||
+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
|
|
||||||
+ shlibpath_overrides_runpath=yes
|
|
||||||
+ shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
;;
|
|
||||||
|
|
||||||
hpux9* | hpux10*)
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
--- ltconfig.darwin 2000-02-02 19:53:22.000000000 -0500
|
|
||||||
+++ ltconfig 2004-09-23 20:25:11.000000000 -0400
|
|
||||||
@@ -678,6 +678,11 @@
|
|
||||||
cygwin* | mingw* | os2*)
|
|
||||||
# We can build DLLs from non-PIC.
|
|
||||||
;;
|
|
||||||
+ darwin* | rhapsody*)
|
|
||||||
+ # PIC is the default on this platform
|
|
||||||
+ # Common symbols not allowed in MH_DYLIB files
|
|
||||||
+ pic_flag='-fno-common'
|
|
||||||
+ ;;
|
|
||||||
amigaos*)
|
|
||||||
# FIXME: we need at least 68020 code to build shared libraries, but
|
|
||||||
# adding the `-m68020' flag to GCC prevents building anything better,
|
|
||||||
@@ -1361,6 +1372,23 @@
|
|
||||||
hardcode_shlibpath_var=no
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ darwin* | rhapsody*)
|
|
||||||
+ case "$host_os" in
|
|
||||||
+ rhapsody* | darwin1.[012])
|
|
||||||
+ allow_undefined_flag='-undefined suppress'
|
|
||||||
+ ;;
|
|
||||||
+ *) # Darwin 1.3 on
|
|
||||||
+ allow_undefined_flag='-flat_namespace -undefined suppress'
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ 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)'
|
|
||||||
+ # We need to add '_' to the symbols in $export_symbols first
|
|
||||||
+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
|
|
||||||
+ hardcode_direct=yes
|
|
||||||
+ hardcode_shlibpath_var=no
|
|
||||||
+ whole_archive_flag_spec='-all_load $convenience'
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
hpux9* | hpux10* | hpux11*)
|
|
||||||
case "$host_os" in
|
|
||||||
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' ;;
|
|
||||||
@@ -1897,6 +1931,27 @@
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
|
|
||||||
+darwin* | rhapsody*)
|
|
||||||
+ dynamic_linker="$host_os dyld"
|
|
||||||
+ version_type=darwin
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ deplibs_check_method='file_magic Mach-O dynamically linked shared library'
|
|
||||||
+ file_magic_cmd='/usr/bin/file -L'
|
|
||||||
+ case "$host_os" in
|
|
||||||
+ rhapsody* | darwin1.[012])
|
|
||||||
+ file_magic_test_file='/System/Library/Frameworks/System.framework/System'
|
|
||||||
+ ;;
|
|
||||||
+ *) # Darwin 1.3 on
|
|
||||||
+ file_magic_test_file='/usr/lib/libSystem.dylib'
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ 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)'
|
|
||||||
+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
|
|
||||||
+ shlibpath_overrides_runpath=yes
|
|
||||||
+ shlibpath_var=DYLD_LIBRARY_PATH
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
gnu*)
|
|
||||||
version_type=linux
|
|
||||||
need_lib_prefix=no
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
--- ltmain.sh-1.2 Wed May 19 09:17:36 1999
|
|
||||||
+++ ltmain.sh Wed Oct 6 14:38:37 2004
|
|
||||||
@@ -967,6 +967,16 @@
|
|
||||||
versuffix="$current.$revision"
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ darwin)
|
|
||||||
+ # Like Linux, but with the current version available in
|
|
||||||
+ # verstring for coding it into the library header
|
|
||||||
+ major=.`expr $current - $age`
|
|
||||||
+ versuffix="$major.$age.$revision"
|
|
||||||
+ # Darwin ld doesn't like 0 for these options...
|
|
||||||
+ minor_current=`expr $current + 1`
|
|
||||||
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
*)
|
|
||||||
$echo "$modename: unknown library version type \`$version_type'" 1>&2
|
|
||||||
echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
|
|
||||||
@@ -1000,9 +1010,17 @@
|
|
||||||
allow_undefined_flag="$no_undefined_flag"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- # Add libc to deplibs on all systems.
|
|
||||||
- dependency_libs="$deplibs"
|
|
||||||
- deplibs="$deplibs -lc"
|
|
||||||
+ case "$version_type" in
|
|
||||||
+ rhapsody|darwin)
|
|
||||||
+ # Rhapsody C library is in the System framework
|
|
||||||
+ deplibs="$deplibs -framework System"
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ # Add libc to deplibs on all other systems.
|
|
||||||
+ dependency_libs="$deplibs"
|
|
||||||
+ deplibs="$deplibs -lc"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
|
|
||||||
if test "$build_libtool_libs" = yes; then
|
|
||||||
# Get the real and link names of the library.
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
--- ltmain.sh.darwin 2000-02-02 19:53:22.000000000 -0500
|
|
||||||
+++ ltmain.sh 2004-09-23 20:25:11.000000000 -0400
|
|
||||||
@@ -24,6 +24,8 @@
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
+_S_=${LIBTOOL_CMD_SEP-\~}
|
|
||||||
+
|
|
||||||
# Check that we have a working $echo.
|
|
||||||
if test "X$1" = X--no-reexec; then
|
|
||||||
# Discard the --no-reexec flag, and continue.
|
|
||||||
@@ -1079,6 +1079,11 @@
|
|
||||||
# These systems don't actually have c library (as such)
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
||||||
+ # Rhapsody C library is in the System framework
|
|
||||||
+ deplibs="$deplibs -framework System"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
elif test "$arg" = "-lm"; then
|
|
||||||
case "$host" in
|
|
||||||
@@ -1086,6 +1091,11 @@
|
|
||||||
# These systems don't actually have math library (as such)
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
||||||
+ # Rhapsody math library is in the System framework
|
|
||||||
+ deplibs="$deplibs -framework System"
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
deplibs="$deplibs $arg"
|
|
||||||
@@ -1753,6 +1763,16 @@
|
|
||||||
versuffix="-$major-$age-$revision"
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ darwin)
|
|
||||||
+ # Like Linux, but with the current version available in
|
|
||||||
+ # verstring for coding it into the library header
|
|
||||||
+ major=.`expr $current - $age`
|
|
||||||
+ versuffix="$major.$age.$revision"
|
|
||||||
+ # Darwin ld doesn't like 0 for these options...
|
|
||||||
+ minor_current=`expr $current + 1`
|
|
||||||
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
*)
|
|
||||||
$echo "$modename: unknown library version type \`$version_type'" 1>&2
|
|
||||||
echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
|
|
||||||
@@ -1795,6 +1824,10 @@
|
|
||||||
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
|
||||||
# these systems don't actually have a c library (as such)!
|
|
||||||
;;
|
|
||||||
+ *-*-rhapsody* | *-*-darwin1.[012])
|
|
||||||
+ # Rhapsody C library is in the System framework
|
|
||||||
+ deplibs="$deplibs -framework System"
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
# Add libc to deplibs on all other systems.
|
|
||||||
deplibs="$deplibs -lc"
|
|
||||||
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
--- libtool.orig 2009-07-15 16:25:32 +0200
|
|
||||||
+++ libtool 2009-07-15 16:51:56 +0200
|
|
||||||
@@ -3319,7 +3319,14 @@
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if grep "^installed=no" $deplib > /dev/null; then
|
|
||||||
- path="$absdir/$objdir"
|
|
||||||
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
||||||
+ eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
|
||||||
+ for library_name in ${library_names}; do :; done
|
|
||||||
+ if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then
|
|
||||||
+ path="${inst_prefix_dir}${libdir}"
|
|
||||||
+ else
|
|
||||||
+ path="$absdir/$objdir"
|
|
||||||
+ fi
|
|
||||||
else
|
|
||||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
||||||
if test -z "$libdir"; then
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
--- ltmain-release-2-1b.in 2009-06-22 15:33:26.000000000 +0200
|
|
||||||
+++ ltmain-release-2-1b.in.new 2009-07-15 16:59:45.000000000 +0200
|
|
||||||
@@ -4946,7 +4946,14 @@
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- path="-L$absdir/$objdir"
|
|
||||||
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
||||||
+ eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
|
||||||
+ for library_name in ${library_names}; do :; done
|
|
||||||
+ if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then
|
|
||||||
+ path="-L${inst_prefix_dir}${libdir}"
|
|
||||||
+ else
|
|
||||||
+ path="-L$absdir/$objdir"
|
|
||||||
+ fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
Index: tiff-3.8.2/configure
|
|
||||||
===================================================================
|
|
||||||
--- tiff-3.8.2.orig/configure
|
|
||||||
+++ tiff-3.8.2/configure
|
|
||||||
@@ -8199,7 +8199,14 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ # Handle Gentoo/FreeBSD as it was Linux
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -8210,6 +8216,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
Index: expat-1.95.8/configure
|
|
||||||
===================================================================
|
|
||||||
--- expat-1.95.8.orig/configure
|
|
||||||
+++ expat-1.95.8/configure
|
|
||||||
@@ -5479,7 +5479,13 @@ freebsd1*)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
|
|
||||||
@@ -5490,6 +5496,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so'
|
|
||||||
+ soname_spec='${libname}${release}.so$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,120 +0,0 @@
|
|||||||
Index: libiconv-1.10/configure
|
|
||||||
===================================================================
|
|
||||||
--- libiconv-1.10.orig/configure
|
|
||||||
+++ libiconv-1.10/configure
|
|
||||||
@@ -8902,7 +8902,14 @@ kfreebsd*-gnu)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -8913,6 +8920,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -12620,7 +12633,14 @@ kfreebsd*-gnu)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -12631,6 +12651,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -15784,7 +15810,14 @@ kfreebsd*-gnu)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -15795,6 +15828,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -18150,7 +18189,14 @@ kfreebsd*-gnu)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -18161,6 +18207,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
Index: libtool-1.5.18/configure
|
|
||||||
===================================================================
|
|
||||||
--- libtool-1.5.18.orig/configure
|
|
||||||
+++ libtool-1.5.18/configure
|
|
||||||
@@ -8433,7 +8433,13 @@ freebsd* | dragonfly*)
|
|
||||||
# DragonFly does not have aout. When/if they implement a new
|
|
||||||
# versioning mechanism, adjust this.
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -8444,6 +8450,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -12205,7 +12217,13 @@ freebsd* | dragonfly*)
|
|
||||||
# DragonFly does not have aout. When/if they implement a new
|
|
||||||
# versioning mechanism, adjust this.
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -12216,6 +12234,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -15461,7 +15485,13 @@ freebsd* | dragonfly*)
|
|
||||||
# DragonFly does not have aout. When/if they implement a new
|
|
||||||
# versioning mechanism, adjust this.
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -15472,6 +15502,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -17929,7 +17965,13 @@ freebsd* | dragonfly*)
|
|
||||||
# DragonFly does not have aout. When/if they implement a new
|
|
||||||
# versioning mechanism, adjust this.
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -17940,6 +17982,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
Index: libtool-1.5.20/configure
|
|
||||||
===================================================================
|
|
||||||
--- libtool-1.5.20.orig/configure
|
|
||||||
+++ libtool-1.5.20/configure
|
|
||||||
@@ -8441,7 +8441,13 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -8452,6 +8458,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -12228,7 +12240,13 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -12239,6 +12257,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -15492,7 +15516,13 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -15503,6 +15533,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -17968,7 +18004,13 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -17979,6 +18021,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
Index: tiff-3.8.2/configure
|
|
||||||
===================================================================
|
|
||||||
--- tiff-3.8.2.orig/configure
|
|
||||||
+++ tiff-3.8.2/configure
|
|
||||||
@@ -8199,7 +8199,14 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ # Handle Gentoo/FreeBSD as it was Linux
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -8210,6 +8216,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -19253,7 +19265,13 @@ freebsd* | dragonfly*)
|
|
||||||
*) objformat=elf ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -19264,6 +19282,12 @@ freebsd* | dragonfly*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
Index: libtorrent-0.10.0/configure
|
|
||||||
===================================================================
|
|
||||||
--- libtorrent-0.10.0.orig/configure
|
|
||||||
+++ libtorrent-0.10.0/configure
|
|
||||||
@@ -8173,7 +8173,13 @@ kfreebsd*-gnu)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || $ECHO aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -8184,6 +8190,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@@ -12461,7 +12473,13 @@ kfreebsd*-gnu)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || $ECHO aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
|
||||||
@@ -12472,6 +12490,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
||||||
+ soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
Index: jpeg-6b/ltconfig
|
|
||||||
===================================================================
|
|
||||||
--- jpeg-6b.orig/ltconfig
|
|
||||||
+++ jpeg-6b/ltconfig
|
|
||||||
@@ -1126,9 +1126,18 @@ amigaos*)
|
|
||||||
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'
|
|
||||||
;;
|
|
||||||
|
|
||||||
-freebsd2* | freebsd3*)
|
|
||||||
- version_type=sunos
|
|
||||||
- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
|
|
||||||
+freebsd[234567]*)
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux
|
|
||||||
+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}.so'
|
|
||||||
+ soname_spec='${libname}${release}.so.$major'
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=sunos
|
|
||||||
+ library_names_spec='${libname}${release}.so.$versuffix $libname.so'
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
;;
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
Index: libtool-1.3.5/ltconfig
|
|
||||||
===================================================================
|
|
||||||
--- libtool-1.3.5.orig/ltconfig
|
|
||||||
+++ libtool-1.3.5/ltconfig
|
|
||||||
@@ -1888,7 +1888,13 @@ freebsd1*)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case "$version_type" in
|
|
||||||
freebsd-elf*)
|
|
||||||
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
|
||||||
@@ -1903,6 +1909,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so'
|
|
||||||
+ soname_spec='${libname}${release}.so$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case "$host_os" in
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
Index: binutils-2.16.1/ltconfig
|
|
||||||
===================================================================
|
|
||||||
--- binutils-2.16.1.orig/ltconfig
|
|
||||||
+++ binutils-2.16.1/ltconfig
|
|
||||||
@@ -1129,7 +1129,13 @@ freebsd1*)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
|
|
||||||
@@ -1141,6 +1147,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so'
|
|
||||||
+ soname_spec='${libname}${release}.so$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
Index: binutils-2.16.1/ltconfig
|
|
||||||
===================================================================
|
|
||||||
--- binutils-2.16.1.orig/ltconfig
|
|
||||||
+++ binutils-2.16.1/ltconfig
|
|
||||||
@@ -1129,7 +1129,13 @@ freebsd1*)
|
|
||||||
|
|
||||||
freebsd*)
|
|
||||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
|
|
||||||
- version_type=freebsd-$objformat
|
|
||||||
+ case $host_vendor in
|
|
||||||
+ gentoo)
|
|
||||||
+ version_type=linux ;;
|
|
||||||
+ *)
|
|
||||||
+ version_type=freebsd-$objformat ;;
|
|
||||||
+ esac
|
|
||||||
+
|
|
||||||
case $version_type in
|
|
||||||
freebsd-elf*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
|
|
||||||
@@ -1141,6 +1147,12 @@ freebsd*)
|
|
||||||
library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
|
|
||||||
need_version=yes
|
|
||||||
;;
|
|
||||||
+ linux)
|
|
||||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so'
|
|
||||||
+ soname_spec='${libname}${release}.so$major'
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
case $host_os in
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
--- ltmain.sh 2003-09-24 18:22:17.528129376 +0200
|
|
||||||
+++ ltmain.sh 2003-09-24 18:23:17.101072912 +0200
|
|
||||||
@@ -1582,6 +1582,8 @@
|
|
||||||
# Only check for convenience libraries
|
|
||||||
deplibs="$lib $deplibs"
|
|
||||||
tmp_libs=
|
|
||||||
+ # PKGW
|
|
||||||
+ dependency_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
#echo "Adding $deplib to \$deplibs"
|
|
||||||
deplibs="$deplib $deplibs"
|
|
||||||
@@ -1699,6 +1701,8 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
tmp_libs=
|
|
||||||
+ #PKGW
|
|
||||||
+ dependency_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
case $deplib in
|
|
||||||
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
|
|
||||||
@@ -1860,6 +1864,16 @@
|
|
||||||
add="$dir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
add_dir="-L$dir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ # Add the install location to the beginning, minimising possiblilty
|
|
||||||
+ # of linking to older version of the lib already installed.
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
add_shlibpath="$dir"
|
|
||||||
@@ -1918,6 +1932,16 @@
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
add_dir="-L$libdir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ # Add the install location to the beginning, minimising possiblilty
|
|
||||||
+ # of linking to older version of the lib already installed.
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -2117,7 +2141,7 @@
|
|
||||||
-L*)
|
|
||||||
case " $tmp_libs " in
|
|
||||||
*" $deplib "*) ;;
|
|
||||||
- *) tmp_libs="$tmp_libs $deplib" ;;
|
|
||||||
+ *) tmp_libs="$deplib $tmp_libs" ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*) tmp_libs="$tmp_libs $deplib" ;;
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
--- ltmain.sh 2003-09-24 19:48:39.367370072 +0200
|
|
||||||
+++ ltmain.sh 2003-09-24 19:49:31.773403144 +0200
|
|
||||||
@@ -1593,6 +1593,8 @@
|
|
||||||
convenience="$convenience $ladir/$objdir/$old_library"
|
|
||||||
old_convenience="$old_convenience $ladir/$objdir/$old_library"
|
|
||||||
tmp_libs=
|
|
||||||
+ # PKGW
|
|
||||||
+ dependency_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
deplibs="$deplib $deplibs"
|
|
||||||
if test "X$duplicate_deps" = "Xyes" ; then
|
|
||||||
@@ -1710,6 +1712,8 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
tmp_libs=
|
|
||||||
+ #PKGW
|
|
||||||
+ dependency_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
case $deplib in
|
|
||||||
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
|
|
||||||
@@ -1871,6 +1875,16 @@
|
|
||||||
add="$dir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
add_dir="-L$dir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ # Add the install location to the beginning, minimising possiblilty
|
|
||||||
+ # of linking to older version of the lib already installed.
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
add_shlibpath="$dir"
|
|
||||||
@@ -1938,11 +1952,13 @@
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
# Try looking first in the location we're being installed to.
|
|
||||||
- add_dir=
|
|
||||||
+ add_dir="-L$dir"
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
|
||||||
case "$libdir" in
|
|
||||||
[\\/]*)
|
|
||||||
- add_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ # Add the install location to the beginning, minimising possiblilty
|
|
||||||
+ # of linking to older version of the lib already installed.
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
@@ -2146,7 +2162,7 @@
|
|
||||||
-L*)
|
|
||||||
case " $tmp_libs " in
|
|
||||||
*" $deplib "*) ;;
|
|
||||||
- *) tmp_libs="$tmp_libs $deplib" ;;
|
|
||||||
+ *) tmp_libs="$deplib $tmp_libs" ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*) tmp_libs="$tmp_libs $deplib" ;;
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
--- ltmain.sh 2003-09-24 18:18:14.961005184 +0200
|
|
||||||
+++ ltmain.sh 2003-09-24 18:20:11.204333512 +0200
|
|
||||||
@@ -2022,6 +2022,8 @@
|
|
||||||
convenience="$convenience $ladir/$objdir/$old_library"
|
|
||||||
old_convenience="$old_convenience $ladir/$objdir/$old_library"
|
|
||||||
tmp_libs=
|
|
||||||
+ # PKGW
|
|
||||||
+ dependency_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
deplibs="$deplib $deplibs"
|
|
||||||
if test "X$duplicate_deps" = "Xyes" ; then
|
|
||||||
@@ -2143,6 +2145,8 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
tmp_libs=
|
|
||||||
+ #PKGW
|
|
||||||
+ dependency_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
case $deplib in
|
|
||||||
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
|
|
||||||
@@ -2359,7 +2363,9 @@
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
|
||||||
case "$libdir" in
|
|
||||||
[\\/]*)
|
|
||||||
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
|
||||||
+ # Add the install location to the beginning, minimising possiblilty
|
|
||||||
+ # of linking to older version of the lib already installed.
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
@@ -2431,7 +2437,9 @@
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
|
||||||
case "$libdir" in
|
|
||||||
[\\/]*)
|
|
||||||
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
|
||||||
+ # Add the install location to the beginning, minimising possiblilty
|
|
||||||
+ # of linking to older version of the lib already installed.
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
@@ -2691,7 +2699,7 @@
|
|
||||||
-L*)
|
|
||||||
case " $tmp_libs " in
|
|
||||||
*" $deplib "*) ;;
|
|
||||||
- *) tmp_libs="$tmp_libs $deplib" ;;
|
|
||||||
+ *) tmp_libs="$deplib $tmp_libs" ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*) tmp_libs="$tmp_libs $deplib" ;;
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- configure.orig
|
|
||||||
+++ configure
|
|
||||||
@@ -9933,6 +9933,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
||||||
fi
|
|
||||||
supports_anon_versioning=no
|
|
||||||
case `$LD -v 2>&1` in
|
|
||||||
+ *GNU\ gold*) supports_anon_versioning=yes ;;
|
|
||||||
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
|
|
||||||
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
|
||||||
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -2208,4 +2208,4 @@
|
|
||||||
relink)
|
|
||||||
- if test "$hardcode_direct" = yes; then
|
|
||||||
+ if false && test "$hardcode_direct" = yes; then
|
|
||||||
add="$dir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html
|
|
||||||
|
|
||||||
but this patch disables hardcoding independent of inst_prefix_dir at all,
|
|
||||||
for both hardcode_direct=yes and hardcode_minus_L=yes.
|
|
||||||
|
|
||||||
If you update this patch, please also update libtool/files/libtool-1.3d-hardcode.patch
|
|
||||||
|
|
||||||
--- ltmain.in.orig 2008-04-16 15:54:04.000000000 +0200
|
|
||||||
+++ ltmain.in 2008-04-16 16:21:04.000000000 +0200
|
|
||||||
@@ -1900,9 +1900,9 @@
|
|
||||||
add_dir=
|
|
||||||
add=
|
|
||||||
# Finalize command for both is simple: just hardcode it.
|
|
||||||
- if test "$hardcode_direct" = yes; then
|
|
||||||
+ if false && test "$hardcode_direct" = yes; then
|
|
||||||
add="$libdir/$linklib"
|
|
||||||
- elif test "$hardcode_minus_L" = yes; then
|
|
||||||
+ elif false && test "$hardcode_minus_L" = yes; then
|
|
||||||
add_dir="-L$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
Hardcoding library path does not work with DESTDIR installs.
|
|
||||||
|
|
||||||
Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'.
|
|
||||||
According to libtool.m4 (as of libtool-1.5.26), these are:
|
|
||||||
*-aix*
|
|
||||||
*-hpux9
|
|
||||||
hppa-hpux* (not hppa64 or ia64)
|
|
||||||
*-netbsd
|
|
||||||
*-openbsd
|
|
||||||
*-freebsd
|
|
||||||
*-dragonfly
|
|
||||||
*-newsos6
|
|
||||||
*-os2
|
|
||||||
*-amigaos
|
|
||||||
*-sunos4
|
|
||||||
*-sysv4
|
|
||||||
It definitely is required for aix (to support DESTDIR),
|
|
||||||
although it should help for others too...
|
|
||||||
|
|
||||||
--- ../../libtool.orig 2009-07-16 18:06:59 +0200
|
|
||||||
+++ ../../libtool 2009-07-16 18:07:45 +0200
|
|
||||||
@@ -6298,13 +6298,13 @@
|
|
||||||
add_dir=
|
|
||||||
add=
|
|
||||||
# Finalize command for both is simple: just hardcode it.
|
|
||||||
if test "$hardcode_direct" = yes &&
|
|
||||||
test "$hardcode_direct_absolute" = no; then
|
|
||||||
add="$libdir/$linklib"
|
|
||||||
- elif test "$hardcode_minus_L" = yes; then
|
|
||||||
+ elif false && test "$hardcode_minus_L" = yes; then
|
|
||||||
add_dir="-L$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
case :$finalize_shlibpath: in
|
|
||||||
*":$libdir:"*) ;;
|
|
||||||
*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
http://lists.gnu.org/archive/html/libtool/2006-01/msg00012.html
|
|
||||||
|
|
||||||
--- ltmain.sh.orig 2007-11-19 17:07:34.946648000 +0100
|
|
||||||
+++ ltmain.sh 2007-11-19 17:07:57.785975000 +0100
|
|
||||||
@@ -3915,8 +3915,11 @@
|
|
||||||
test -n "$hardcode_libdirs"; then
|
|
||||||
libdir="$hardcode_libdirs"
|
|
||||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
|
||||||
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
|
||||||
- else
|
|
||||||
+ case $archive_cmds in
|
|
||||||
+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
|
|
||||||
+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
|
|
||||||
+ esac
|
|
||||||
+ else
|
|
||||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
must not search /usr/local in prefix
|
|
||||||
|
|
||||||
--- configure.orig 2007-12-02 19:14:55 +0100
|
|
||||||
+++ configure 2007-12-02 19:14:59 +0100
|
|
||||||
@@ -8920,9 +8920,17 @@
|
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
||||||
soname_spec='${libname}${release}${shared_ext}$major'
|
|
||||||
if test "X$HPUX_IA64_MODE" = X32; then
|
|
||||||
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
|
||||||
+ if test "$GCC" = yes; then
|
|
||||||
+ sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux32"
|
|
||||||
+ else
|
|
||||||
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
|
||||||
+ fi
|
|
||||||
else
|
|
||||||
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
|
||||||
+ if test "$GCC" = yes; then
|
|
||||||
+ sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux64"
|
|
||||||
+ else
|
|
||||||
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
|
||||||
;;
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- install-sh 2007-07-04 14:36:49 +0100
|
|
||||||
+++ install-sh 2007-09-14 11:00:41 +0100
|
|
||||||
@@ -192,7 +192,10 @@
|
|
||||||
|
|
||||||
if [ x"$dir_arg" != x ]
|
|
||||||
then
|
|
||||||
- $doit $instcmd $dst &&
|
|
||||||
+ { $doit $instcmd "$dst" || lasterr=$?
|
|
||||||
+ # It's ok for mkdir to fail if the directory already exists.
|
|
||||||
+ test -d "$dst" || { (exit ${lasterr-1}); exit; }
|
|
||||||
+ } &&
|
|
||||||
|
|
||||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
|
|
||||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- install-sh 2006-03-25 20:04:46 +0000
|
|
||||||
+++ install-sh 2007-09-14 10:53:29 +0100
|
|
||||||
@@ -246,7 +246,10 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$dir_arg"; then
|
|
||||||
- $doit $mkdircmd "$dst" \
|
|
||||||
+ { $doit $mkdircmd "$dst" || lasterr=$?
|
|
||||||
+ # It's ok for mkdir to fail if the directory already exists.
|
|
||||||
+ test -d "$dst" || { (exit ${lasterr-1}); exit; }
|
|
||||||
+ } \
|
|
||||||
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
|
|
||||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
|
|
||||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- install-sh 2006-03-14 12:57:54 -0300
|
|
||||||
+++ install-sh 2008-06-19 22:23:04 -0300
|
|
||||||
@@ -240,7 +240,10 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$dir_arg"; then
|
|
||||||
- $doit $instcmd "$dst" \
|
|
||||||
+ { $doit $instcmd "$dst" || lasterr=$?
|
|
||||||
+ # It's ok for mkdir to fail if the directory already exists.
|
|
||||||
+ test -d "$dst" || { (exit ${lasterr-1}); exit; }
|
|
||||||
+ } \
|
|
||||||
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
|
|
||||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
|
|
||||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
I notice that $EPREFIX/usr/share/libtool/config/ltmain.sh also has this
|
|
||||||
stray increment - so I'd assume that this is a bug in libtool (which is
|
|
||||||
perhaps trying to fix a deprecated behaviour of old IRIX versions?).
|
|
||||||
|
|
||||||
http://bugs.gentoo.org/show_bug.cgi?id=301520
|
|
||||||
|
|
||||||
|
|
||||||
--- ltmain.sh.dist 2010-01-19 14:04:22.101603800 +0000
|
|
||||||
+++ ltmain.sh 2010-01-19 14:08:29.361500240 +0000
|
|
||||||
@@ -6225,7 +6225,6 @@ func_mode_link ()
|
|
||||||
current=$func_arith_result
|
|
||||||
age="$number_minor"
|
|
||||||
revision="$number_minor"
|
|
||||||
- lt_irix_increment=no
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
@@ -6297,11 +6296,7 @@ func_mode_link ()
|
|
||||||
;;
|
|
||||||
|
|
||||||
irix | nonstopux)
|
|
||||||
- if test "X$lt_irix_increment" = "Xno"; then
|
|
||||||
- func_arith $current - $age
|
|
||||||
- else
|
|
||||||
- func_arith $current - $age + 1
|
|
||||||
- fi
|
|
||||||
+ func_arith $current - $age
|
|
||||||
major=$func_arith_result
|
|
||||||
|
|
||||||
case $version_type in
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
--- ltmain.sh 2007-09-15 07:35:19 +0100
|
|
||||||
+++ ltmain.sh 2004-01-25 12:40:26 +0000
|
|
||||||
@@ -1854,6 +1840,15 @@
|
|
||||||
lib=
|
|
||||||
found=no
|
|
||||||
case $deplib in
|
|
||||||
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
|
||||||
+ if test "$linkmode,$pass" = "prog,link"; then
|
|
||||||
+ compile_deplibs="$deplib $compile_deplibs"
|
|
||||||
+ finalize_deplibs="$deplib $finalize_deplibs"
|
|
||||||
+ else
|
|
||||||
+ deplibs="$deplib $deplibs"
|
|
||||||
+ fi
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
-l*)
|
|
||||||
if test "$linkmode" != lib && test "$linkmode" != prog; then
|
|
||||||
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
--- ltmain.sh 2004-02-11 20:55:14.587581248 +0200
|
|
||||||
+++ ltmain.sh 2004-02-11 21:15:33.467283368 +0200
|
|
||||||
@@ -117,6 +117,30 @@
|
|
||||||
execute_dlfiles=
|
|
||||||
lo2o="s/\\.lo\$/.${objext}/"
|
|
||||||
o2lo="s/\\.${objext}\$/.lo/"
|
|
||||||
+
|
|
||||||
+if test -z "$max_cmd_len"; then
|
|
||||||
+ i=0
|
|
||||||
+ testring="ABCD"
|
|
||||||
+ new_result=
|
|
||||||
+
|
|
||||||
+ # If test is not a shell built-in, we'll probably end up computing a
|
|
||||||
+ # maximum length that is only half of the actual maximum length, but
|
|
||||||
+ # we can't tell.
|
|
||||||
+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
|
|
||||||
+ = "XX$testring") >/dev/null 2>&1 &&
|
|
||||||
+ new_result=`expr "X$testring" : ".*" 2>&1` &&
|
|
||||||
+ max_cmd_len="$new_result" &&
|
|
||||||
+ test $i != 17 # 1/2 MB should be enough
|
|
||||||
+ do
|
|
||||||
+ i=`expr $i + 1`
|
|
||||||
+ testring="$testring$testring"
|
|
||||||
+ done
|
|
||||||
+ testring=
|
|
||||||
+ # Add a significant safety factor because C++ compilers can tack on massive
|
|
||||||
+ # amounts of additional arguments before passing them to the linker.
|
|
||||||
+ # It appears as though 1/2 is a usable value.
|
|
||||||
+ max_cmd_len=`expr $max_cmd_len \/ 2`
|
|
||||||
+fi
|
|
||||||
|
|
||||||
#####################################
|
|
||||||
# Shell function definitions:
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -136,6 +136,30 @@
|
|
||||||
lo2o="s/\\.lo\$/.${objext}/"
|
|
||||||
o2lo="s/\\.${objext}\$/.lo/"
|
|
||||||
quote_scanset='[[~#^*{};<>?'"'"' ]'
|
|
||||||
+
|
|
||||||
+if test -z "$max_cmd_len"; then
|
|
||||||
+ i=0
|
|
||||||
+ testring="ABCD"
|
|
||||||
+ new_result=
|
|
||||||
+
|
|
||||||
+ # If test is not a shell built-in, we'll probably end up computing a
|
|
||||||
+ # maximum length that is only half of the actual maximum length, but
|
|
||||||
+ # we can't tell.
|
|
||||||
+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
|
|
||||||
+ = "XX$testring") >/dev/null 2>&1 &&
|
|
||||||
+ new_result=`expr "X$testring" : ".*" 2>&1` &&
|
|
||||||
+ max_cmd_len="$new_result" &&
|
|
||||||
+ test "$i" != 17 # 1/2 MB should be enough
|
|
||||||
+ do
|
|
||||||
+ i=`expr $i + 1`
|
|
||||||
+ testring="$testring$testring"
|
|
||||||
+ done
|
|
||||||
+ testring=
|
|
||||||
+ # Add a significant safety factor because C++ compilers can tack on massive
|
|
||||||
+ # amounts of additional arguments before passing them to the linker.
|
|
||||||
+ # It appears as though 1/2 is a usable value.
|
|
||||||
+ max_cmd_len=`expr $max_cmd_len \/ 2`
|
|
||||||
+fi
|
|
||||||
|
|
||||||
#####################################
|
|
||||||
# Shell function definitions:
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -136,6 +136,30 @@
|
|
||||||
execute_dlfiles=
|
|
||||||
lo2o="s/\\.lo\$/.${objext}/"
|
|
||||||
o2lo="s/\\.${objext}\$/.lo/"
|
|
||||||
+
|
|
||||||
+if test -z "$max_cmd_len"; then
|
|
||||||
+ i=0
|
|
||||||
+ testring="ABCD"
|
|
||||||
+ new_result=
|
|
||||||
+
|
|
||||||
+ # If test is not a shell built-in, we'll probably end up computing a
|
|
||||||
+ # maximum length that is only half of the actual maximum length, but
|
|
||||||
+ # we can't tell.
|
|
||||||
+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
|
|
||||||
+ = "XX$testring") >/dev/null 2>&1 &&
|
|
||||||
+ new_result=`expr "X$testring" : ".*" 2>&1` &&
|
|
||||||
+ max_cmd_len="$new_result" &&
|
|
||||||
+ test "$i" != 17 # 1/2 MB should be enough
|
|
||||||
+ do
|
|
||||||
+ i=`expr $i + 1`
|
|
||||||
+ testring="$testring$testring"
|
|
||||||
+ done
|
|
||||||
+ testring=
|
|
||||||
+ # Add a significant safety factor because C++ compilers can tack on massive
|
|
||||||
+ # amounts of additional arguments before passing them to the linker.
|
|
||||||
+ # It appears as though 1/2 is a usable value.
|
|
||||||
+ max_cmd_len=`expr $max_cmd_len \/ 2`
|
|
||||||
+fi
|
|
||||||
|
|
||||||
#####################################
|
|
||||||
# Shell function definitions:
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
Calculating the max args here takes hours.
|
|
||||||
|
|
||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -7351,6 +7351,10 @@
|
|
||||||
lt_cv_sys_max_cmd_len=8192;
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ mint*)
|
|
||||||
+ lt_cv_sys_max_cmd_len=8192;
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
amigaos*)
|
|
||||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
|
||||||
# So we just punt and use a minimum line length of 8192.
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- release-1-3d.orig 2009-12-03 17:05:15.608916799 +0100
|
|
||||||
+++ release-1-3d 2009-12-14 22:01:06.634927600 +0100
|
|
||||||
@@ -1035,6 +1035,10 @@
|
|
||||||
esac
|
|
||||||
elif test "$arg" = "-lm"; then
|
|
||||||
case $host in
|
|
||||||
+ *-*-hpux*)
|
|
||||||
+ # Compiler inserts libc in the correct place for threads to work
|
|
||||||
+ test "X$arg" = "X-lc" && continue
|
|
||||||
+ ;;
|
|
||||||
*-*-cygwin* | *-*-pw32* | *-*-beos*)
|
|
||||||
# These systems don't actually have math library (as such)
|
|
||||||
continue
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- release-1-5-22.orig 2009-12-03 17:05:15.605534999 +0100
|
|
||||||
+++ release-1-5-22 2009-12-14 21:56:58.884956366 +0100
|
|
||||||
@@ -1573,7 +1573,7 @@
|
|
||||||
# Causes problems with __ctype
|
|
||||||
test "X$arg" = "X-lc" && continue
|
|
||||||
;;
|
|
||||||
- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
|
|
||||||
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX* | *-*-hpux*)
|
|
||||||
# Compiler inserts libc in the correct place for threads to work
|
|
||||||
test "X$arg" = "X-lc" && continue
|
|
||||||
;;
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -5148,8 +5148,8 @@
|
|
||||||
else
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
||||||
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
|
|
||||||
-See \`config.log' for more details" "$LINENO" 5; }
|
|
||||||
+$as_echo "See \`config.log' for more details." >&5;
|
|
||||||
+$ac_echo "C++ sucks, ignoring ..." >&5; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
ac_ext=c
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -5148,10 +5148,8 @@
|
|
||||||
:
|
|
||||||
else
|
|
||||||
{ { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
|
|
||||||
-See \`config.log' for more details." >&5
|
|
||||||
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
|
|
||||||
-See \`config.log' for more details." >&2;}
|
|
||||||
- { (exit 1); exit 1; }; }
|
|
||||||
+See \`config.log' for more details." >&5;}
|
|
||||||
+ { echo "C++ sucks, ignoring ..." >&5; }; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
ac_ext=cc
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
# Dummy patch, not needed by libtool-1.2
|
|
||||||
|
|
||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -32,1 +32,1 @@
|
|
||||||
-PACKAGE=libtool
|
|
||||||
+PACKAGE=libtool
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
--- ltmain.sh 2005-09-02 22:19:17.000000000 +0200
|
|
||||||
+++ ltmain.sh 2005-09-02 22:20:55.000000000 +0200
|
|
||||||
@@ -3769,9 +3769,50 @@
|
|
||||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- newdependency_libs="$newdependency_libs $libdir/$name"
|
|
||||||
+ # We do not want portage's install root ($D) present. Check only for
|
|
||||||
+ # this if the .la is being installed.
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$libdir/$name"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_1"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ if test "$installed" = yes; then
|
|
||||||
+ # Rather use S=WORKDIR if our version of portage supports it.
|
|
||||||
+ # This is because some ebuild (gcc) do not use $S as buildroot.
|
|
||||||
+ if test "$WORKDIR"; then
|
|
||||||
+ S="$WORKDIR"
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's build root ($S) present.
|
|
||||||
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
|
|
||||||
+ # We do not want portage's install root ($D) present.
|
|
||||||
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
|
|
||||||
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
|
|
||||||
+ mynewdependency_lib=""
|
|
||||||
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_4"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
;;
|
|
||||||
- *) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
dependency_libs="$newdependency_libs"
|
|
||||||
@@ -3799,6 +3840,10 @@
|
|
||||||
dlprefiles="$newdlprefiles"
|
|
||||||
fi
|
|
||||||
$rm $output
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ fi
|
|
||||||
$echo > $output "\
|
|
||||||
# $outputname - a libtool library file
|
|
||||||
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
--- ltmain.sh 2005-05-13 10:53:28.000000000 +0200
|
|
||||||
+++ ltmain.sh 2005-05-13 11:44:15.000000000 +0200
|
|
||||||
@@ -3078,6 +3078,68 @@
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
output="$output_objdir/$outputname"i
|
|
||||||
+ # Replace all uninstalled libtool libraries with the installed ones
|
|
||||||
+ newdependency_libs=
|
|
||||||
+ for deplib in $dependency_libs; do
|
|
||||||
+ case $deplib in
|
|
||||||
+ *.la)
|
|
||||||
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
|
||||||
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
||||||
+ if test -z "$libdir"; then
|
|
||||||
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
||||||
+ exit $EXIT_FAILURE
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's install root ($D) present. Check only for
|
|
||||||
+ # this if the .la is being installed.
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$libdir/$name"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_1"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ if test "$installed" = yes; then
|
|
||||||
+ # Rather use S=WORKDIR if our version of portage supports it.
|
|
||||||
+ # This is because some ebuild (gcc) do not use $S as buildroot.
|
|
||||||
+ if test "$WORKDIR"; then
|
|
||||||
+ S="$WORKDIR"
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's build root ($S) present.
|
|
||||||
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
|
|
||||||
+ # We do not want portage's install root ($D) present.
|
|
||||||
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
|
|
||||||
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
|
|
||||||
+ mynewdependency_lib=""
|
|
||||||
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_4"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ done
|
|
||||||
+ dependency_libs="$newdependency_libs"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
fi
|
|
||||||
$rm $output
|
|
||||||
$echo > $output "\
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
Note that if you update this patch, please update this one as well:
|
|
||||||
|
|
||||||
eclass/ELT-patches/portage/1.4.1
|
|
||||||
|
|
||||||
The file name can stay 1.4.1, as it will still apply to all versions. Only
|
|
||||||
when a new version of libtool comes out that it do not apply to, then the
|
|
||||||
name should be bumped, but the patch content should stay fairly the same.
|
|
||||||
|
|
||||||
--- ltmain.sh Wed Apr 3 01:19:37 2002
|
|
||||||
+++ ltmain.sh Sun May 26 19:50:52 2002
|
|
||||||
@@ -3940,9 +3940,50 @@
|
|
||||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- newdependency_libs="$newdependency_libs $libdir/$name"
|
|
||||||
+ # We do not want portage's install root ($D) present. Check only for
|
|
||||||
+ # this if the .la is being installed.
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$libdir/$name"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_1"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ if test "$installed" = yes; then
|
|
||||||
+ # Rather use S=WORKDIR if our version of portage supports it.
|
|
||||||
+ # This is because some ebuild (gcc) do not use $S as buildroot.
|
|
||||||
+ if test "$WORKDIR"; then
|
|
||||||
+ S="$WORKDIR"
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's build root ($S) present.
|
|
||||||
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
|
|
||||||
+ # We do not want portage's install root ($D) present.
|
|
||||||
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
|
|
||||||
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
|
|
||||||
+ mynewdependency_lib=""
|
|
||||||
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_4"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
;;
|
|
||||||
- *) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
dependency_libs="$newdependency_libs"
|
|
||||||
@@ -3975,6 +4005,10 @@
|
|
||||||
case $host,$output,$installed,$module,$dlname in
|
|
||||||
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
|
||||||
esac
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ fi
|
|
||||||
$echo > $output "\
|
|
||||||
# $outputname - a libtool library file
|
|
||||||
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
Note that if you update this patch, please update this one as well:
|
|
||||||
|
|
||||||
eclass/ELT-patches/portage/1.4.1
|
|
||||||
|
|
||||||
The file name can stay 1.4.1, as it will still apply to all versions. Only
|
|
||||||
when a new version of libtool comes out that it do not apply to, then the
|
|
||||||
name should be bumped, but the patch content should stay fairly the same.
|
|
||||||
|
|
||||||
--- ltmain.sh Wed Apr 3 01:19:37 2002
|
|
||||||
+++ ltmain.sh Sun May 26 19:50:52 2002
|
|
||||||
@@ -3940,9 +3940,53 @@
|
|
||||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- newdependency_libs="$newdependency_libs $libdir/$name"
|
|
||||||
+ if test "x$EGREP" = x ; then
|
|
||||||
+ EGREP=egrep
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's install root ($D) present. Check only for
|
|
||||||
+ # this if the .la is being installed.
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$libdir/$name"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_1"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ if test "$installed" = yes; then
|
|
||||||
+ # Rather use S=WORKDIR if our version of portage supports it.
|
|
||||||
+ # This is because some ebuild (gcc) do not use $S as buildroot.
|
|
||||||
+ if test "$WORKDIR"; then
|
|
||||||
+ S="$WORKDIR"
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's build root ($S) present.
|
|
||||||
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
|
|
||||||
+ # We do not want portage's install root ($D) present.
|
|
||||||
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
|
|
||||||
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
|
|
||||||
+ mynewdependency_lib=""
|
|
||||||
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_4"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
;;
|
|
||||||
- *) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
dependency_libs="$newdependency_libs"
|
|
||||||
@@ -3975,6 +4005,10 @@
|
|
||||||
case $host,$output,$installed,$module,$dlname in
|
|
||||||
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
|
||||||
esac
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ fi
|
|
||||||
$echo > $output "\
|
|
||||||
# $outputname - a libtool library file
|
|
||||||
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -7410,9 +7410,53 @@
|
|
||||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
||||||
test -z "$libdir" && \
|
|
||||||
func_fatal_error "\`$deplib' is not a valid libtool archive"
|
|
||||||
- newdependency_libs="$newdependency_libs $libdir/$name"
|
|
||||||
+ if test "x$EGREP" = x ; then
|
|
||||||
+ EGREP=egrep
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's install root ($D) present. Check only for
|
|
||||||
+ # this if the .la is being installed.
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$libdir/$name"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_1"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ if test "$installed" = yes; then
|
|
||||||
+ # Rather use S=WORKDIR if our version of portage supports it.
|
|
||||||
+ # This is because some ebuild (gcc) do not use $S as buildroot.
|
|
||||||
+ if test "$WORKDIR"; then
|
|
||||||
+ S="$WORKDIR"
|
|
||||||
+ fi
|
|
||||||
+ # We do not want portage's build root ($S) present.
|
|
||||||
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
|
|
||||||
+ # We do not want portage's install root ($D) present.
|
|
||||||
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
|
|
||||||
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
|
|
||||||
+ mynewdependency_lib=""
|
|
||||||
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
|
|
||||||
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ else
|
|
||||||
+ mynewdependency_lib="$deplib"
|
|
||||||
+ fi
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$mynewdependency_lib"; then
|
|
||||||
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
+ if test -z "$my_little_ninja_foo_4"; then
|
|
||||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
;;
|
|
||||||
- *) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
dependency_libs="$newdependency_libs"
|
|
||||||
@@ -7476,6 +7520,10 @@
|
|
||||||
case $host,$output,$installed,$module,$dlname in
|
|
||||||
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
|
||||||
esac
|
|
||||||
+ # Do not add duplicates
|
|
||||||
+ if test "$installed" = yes && test "$D"; then
|
|
||||||
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
|
||||||
+ fi
|
|
||||||
$ECHO > $output "\
|
|
||||||
# $outputname - a libtool library file
|
|
||||||
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
--- ltmain.sh
|
|
||||||
+++ ltmain.sh
|
|
||||||
@@ -3203,6 +3203,12 @@
|
|
||||||
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
+ else
|
|
||||||
+ case $libdir in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
fi
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
@@ -6630,7 +6636,7 @@
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
|
|
||||||
- if test -n "$libdir" && test ! -f "$libfile"; then
|
|
||||||
+ if test -n "$libdir" && test ! -f "${D}$libfile"; then
|
|
||||||
$echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
|
|
||||||
finalize=no
|
|
||||||
fi
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
--- ltmain-v2.2.6.in 2009-06-22 15:33:27.000000000 +0200
|
|
||||||
+++ ltmain-v2.2.6.in.new 2009-07-16 16:21:04.000000000 +0200
|
|
||||||
@@ -1742,7 +1742,7 @@
|
|
||||||
func_source "$lib"
|
|
||||||
fi
|
|
||||||
libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
|
|
||||||
- if test -n "$libdir" && test ! -f "$libfile"; then
|
|
||||||
+ if test -n "$libdir" && test ! -f "${D}$libfile"; then
|
|
||||||
func_warning "\`$lib' has not been installed in \`$libdir'"
|
|
||||||
finalize=no
|
|
||||||
fi
|
|
||||||
@@ -5351,6 +5351,12 @@
|
|
||||||
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
+ else
|
|
||||||
+ case $libdir in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
fi
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
--- ltmain.sh Wed Oct 3 02:05:35 2001
|
|
||||||
+++ ltmain.sh Wed Oct 3 05:16:14 2001
|
|
||||||
@@ -754,6 +754,7 @@
|
|
||||||
linker_flags=
|
|
||||||
dllsearchpath=
|
|
||||||
lib_search_path=`pwd`
|
|
||||||
+ inst_prefix_dir=
|
|
||||||
|
|
||||||
avoid_version=no
|
|
||||||
dlfiles=
|
|
||||||
@@ -884,6 +885,11 @@
|
|
||||||
prev=
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ inst_prefix)
|
|
||||||
+ inst_prefix_dir="$arg"
|
|
||||||
+ prev=
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
release)
|
|
||||||
release="-$arg"
|
|
||||||
prev=
|
|
||||||
@@ -985,6 +991,11 @@
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -inst-prefix-dir)
|
|
||||||
+ prev=inst_prefix
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
||||||
# so, if we see these flags be careful not to treat them like -L
|
|
||||||
-L[A-Z][A-Z]*:*)
|
|
||||||
@@ -1866,6 +1877,7 @@
|
|
||||||
|
|
||||||
if test "$linkmode" = prog || test "$mode" = relink; then
|
|
||||||
add_shlibpath=
|
|
||||||
+ add_prefix_dir=
|
|
||||||
add_dir=
|
|
||||||
add=
|
|
||||||
# Finalize command for both is simple: just hardcode it.
|
|
||||||
@@ -1886,10 +1898,22 @@
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_prefix_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ # add_prefix_dir must be appended instead, otherwise it can
|
|
||||||
+ # possibly be overrided by any hardcoded -L/... path in deplibs
|
|
||||||
if test "$linkmode" = prog; then
|
|
||||||
+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
|
||||||
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
|
||||||
else
|
|
||||||
+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
|
||||||
test -n "$add" && deplibs="$add $deplibs"
|
|
||||||
fi
|
|
||||||
@@ -3856,7 +3880,7 @@
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# Quote the link command for shipping.
|
|
||||||
- relink_command="($relink_command; cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
|
|
||||||
+ relink_command="($relink_command; cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
# Only create the output if not a dry run.
|
|
||||||
@@ -4157,6 +4181,24 @@
|
|
||||||
dir="$dir$objdir"
|
|
||||||
|
|
||||||
if test -n "$relink_command"; then
|
|
||||||
+ # Determine the prefix the user has applied to our future dir.
|
|
||||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
|
||||||
+
|
|
||||||
+ # Don't allow the user to place us outside of our expected
|
|
||||||
+ # location b/c this prevents finding dependent libraries that
|
|
||||||
+ # are installed to the same prefix.
|
|
||||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
|
||||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
||||||
+ exit 1
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ # Stick the inst_prefix_dir data into the link command.
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
||||||
+ else
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
||||||
$show "$relink_command"
|
|
||||||
if $run eval "$relink_command"; then :
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
--- ltmain.sh Wed Oct 3 02:05:35 2001
|
|
||||||
+++ ltmain.sh Wed Oct 3 05:16:14 2001
|
|
||||||
@@ -754,6 +754,7 @@
|
|
||||||
linker_flags=
|
|
||||||
dllsearchpath=
|
|
||||||
lib_search_path=`pwd`
|
|
||||||
+ inst_prefix_dir=
|
|
||||||
|
|
||||||
avoid_version=no
|
|
||||||
dlfiles=
|
|
||||||
@@ -884,6 +885,11 @@
|
|
||||||
prev=
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ inst_prefix)
|
|
||||||
+ inst_prefix_dir="$arg"
|
|
||||||
+ prev=
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
release)
|
|
||||||
release="-$arg"
|
|
||||||
prev=
|
|
||||||
@@ -985,6 +991,11 @@
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -inst-prefix-dir)
|
|
||||||
+ prev=inst_prefix
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
||||||
# so, if we see these flags be careful not to treat them like -L
|
|
||||||
-L[A-Z][A-Z]*:*)
|
|
||||||
@@ -1866,6 +1877,7 @@
|
|
||||||
|
|
||||||
if test "$linkmode" = prog || test "$mode" = relink; then
|
|
||||||
add_shlibpath=
|
|
||||||
+ add_prefix_dir=
|
|
||||||
add_dir=
|
|
||||||
add=
|
|
||||||
# Finalize command for both is simple: just hardcode it.
|
|
||||||
@@ -1886,10 +1898,22 @@
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_prefix_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ # add_prefix_dir must be appended instead, otherwise it can
|
|
||||||
+ # possibly be overrided by any hardcoded -L/... path in deplibs
|
|
||||||
if test "$linkmode" = prog; then
|
|
||||||
+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
|
||||||
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
|
||||||
else
|
|
||||||
+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
|
||||||
test -n "$add" && deplibs="$add $deplibs"
|
|
||||||
fi
|
|
||||||
@@ -3856,7 +3880,7 @@
|
|
||||||
for tag in $taglist; do
|
|
||||||
tagopts="$tagopts --tag $tag"
|
|
||||||
done
|
|
||||||
- relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)"
|
|
||||||
+ relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)"
|
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
# Only create the output if not a dry run.
|
|
||||||
@@ -4157,6 +4181,24 @@
|
|
||||||
dir="$dir$objdir"
|
|
||||||
|
|
||||||
if test -n "$relink_command"; then
|
|
||||||
+ # Determine the prefix the user has applied to our future dir.
|
|
||||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
|
||||||
+
|
|
||||||
+ # Don't allow the user to place us outside of our expected
|
|
||||||
+ # location b/c this prevents finding dependent libraries that
|
|
||||||
+ # are installed to the same prefix.
|
|
||||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
|
||||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
||||||
+ exit 1
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ # Stick the inst_prefix_dir data into the link command.
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
||||||
+ else
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
||||||
$show "$relink_command"
|
|
||||||
if $run eval "$relink_command"; then :
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
--- ltmain.sh Wed Oct 3 02:05:35 2001
|
|
||||||
+++ ltmain.sh Wed Oct 3 05:16:14 2001
|
|
||||||
@@ -754,6 +754,7 @@
|
|
||||||
linker_flags=
|
|
||||||
dllsearchpath=
|
|
||||||
lib_search_path=`pwd`
|
|
||||||
+ inst_prefix_dir=
|
|
||||||
|
|
||||||
avoid_version=no
|
|
||||||
dlfiles=
|
|
||||||
@@ -884,6 +885,11 @@
|
|
||||||
prev=
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ inst_prefix)
|
|
||||||
+ inst_prefix_dir="$arg"
|
|
||||||
+ prev=
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
release)
|
|
||||||
release="-$arg"
|
|
||||||
prev=
|
|
||||||
@@ -985,6 +991,11 @@
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -inst-prefix-dir)
|
|
||||||
+ prev=inst_prefix
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
||||||
# so, if we see these flags be careful not to treat them like -L
|
|
||||||
-L[A-Z][A-Z]*:*)
|
|
||||||
@@ -1866,6 +1877,7 @@
|
|
||||||
|
|
||||||
if test "$linkmode" = prog || test "$mode" = relink; then
|
|
||||||
add_shlibpath=
|
|
||||||
+ add_prefix_dir=
|
|
||||||
add_dir=
|
|
||||||
add=
|
|
||||||
# Finalize command for both is simple: just hardcode it.
|
|
||||||
@@ -1886,10 +1898,22 @@
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if test $linkmode = prog; then
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_prefix_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ # add_prefix_dir must be appended instead, otherwise it can
|
|
||||||
+ # possibly be overrided by any hardcoded -L/... path in deplibs
|
|
||||||
+ if test "$linkmode" = prog; then
|
|
||||||
+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
|
||||||
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
|
||||||
else
|
|
||||||
+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
|
||||||
test -n "$add" && deplibs="$add $deplibs"
|
|
||||||
fi
|
|
||||||
@@ -3856,7 +3880,7 @@
|
|
||||||
for tag in $taglist; do
|
|
||||||
tagopts="$tagopts --tag $tag"
|
|
||||||
done
|
|
||||||
- relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)"
|
|
||||||
+ relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)"
|
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
# Only create the output if not a dry run.
|
|
||||||
@@ -4157,6 +4181,24 @@
|
|
||||||
dir="$dir$objdir"
|
|
||||||
|
|
||||||
if test -n "$relink_command"; then
|
|
||||||
+ # Determine the prefix the user has applied to our future dir.
|
|
||||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
|
||||||
+
|
|
||||||
+ # Don't allow the user to place us outside of our expected
|
|
||||||
+ # location b/c this prevents finding dependent libraries that
|
|
||||||
+ # are installed to the same prefix.
|
|
||||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
|
||||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
||||||
+ exit 1
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ # Stick the inst_prefix_dir data into the link command.
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
||||||
+ else
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
||||||
$show "$relink_command"
|
|
||||||
if $run eval "$relink_command"; then :
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
--- ltmain.sh Sun Aug 12 18:08:05 2001
|
|
||||||
+++ ltmain.sh Tue Aug 28 18:55:13 2001
|
|
||||||
@@ -827,6 +827,7 @@
|
|
||||||
linker_flags=
|
|
||||||
dllsearchpath=
|
|
||||||
lib_search_path=`pwd`
|
|
||||||
+ inst_prefix_dir=
|
|
||||||
|
|
||||||
avoid_version=no
|
|
||||||
dlfiles=
|
|
||||||
@@ -959,6 +960,11 @@
|
|
||||||
prev=
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ inst_prefix)
|
|
||||||
+ inst_prefix_dir="$arg"
|
|
||||||
+ prev=
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
release)
|
|
||||||
release="-$arg"
|
|
||||||
prev=
|
|
||||||
@@ -1167,6 +1173,11 @@
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -inst-prefix-dir)
|
|
||||||
+ prev=inst_prefix
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
||||||
# so, if we see these flags be careful not to treat them like -L
|
|
||||||
-L[A-Z][A-Z]*:*)
|
|
||||||
@@ -2231,7 +2242,16 @@
|
|
||||||
if test "$hardcode_direct" = yes; then
|
|
||||||
add="$libdir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ add_dir=
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+ add_dir="$add_dir -L$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
case :$finalize_shlibpath: in
|
|
||||||
@@ -2241,7 +2261,16 @@
|
|
||||||
add="-l$name"
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ add_dir=
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+ add_dir="$add_dir -L$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -4321,7 +4350,7 @@
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# Quote the link command for shipping.
|
|
||||||
- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
|
|
||||||
+ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
|
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
# Only create the output if not a dry run.
|
|
||||||
@@ -4622,12 +4651,30 @@
|
|
||||||
dir="$dir$objdir"
|
|
||||||
|
|
||||||
if test -n "$relink_command"; then
|
|
||||||
+ # Determine the prefix the user has applied to our future dir.
|
|
||||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
|
||||||
+
|
|
||||||
+ # Don't allow the user to place us outside of our expected
|
|
||||||
+ # location b/c this prevents finding dependent libraries that
|
|
||||||
+ # are installed to the same prefix.
|
|
||||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
|
||||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
||||||
+ exit 1
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ # Stick the inst_prefix_dir data into the link command.
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
||||||
+ else
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
||||||
$show "$relink_command"
|
|
||||||
if $run eval "$relink_command"; then :
|
|
||||||
else
|
|
||||||
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
|
|
||||||
- continue
|
|
||||||
+ exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -4782,7 +4829,11 @@
|
|
||||||
if test "$finalize" = yes && test -z "$run"; then
|
|
||||||
tmpdir="/tmp"
|
|
||||||
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
|
||||||
- tmpdir="$tmpdir/libtool-$$"
|
|
||||||
+ tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
|
|
||||||
+ if test $? = 0 ; then :
|
|
||||||
+ else
|
|
||||||
+ tmpdir="$tmpdir/libtool-$$"
|
|
||||||
+ fi
|
|
||||||
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
|
|
||||||
else
|
|
||||||
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
--- ltmain.sh Wed Oct 3 02:05:35 2001
|
|
||||||
+++ ltmain.sh Wed Oct 3 05:16:14 2001
|
|
||||||
@@ -754,6 +754,7 @@
|
|
||||||
linker_flags=
|
|
||||||
dllsearchpath=
|
|
||||||
lib_search_path=`pwd`
|
|
||||||
+ inst_prefix_dir=
|
|
||||||
|
|
||||||
avoid_version=no
|
|
||||||
dlfiles=
|
|
||||||
@@ -884,6 +885,11 @@
|
|
||||||
prev=
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ inst_prefix)
|
|
||||||
+ inst_prefix_dir="$arg"
|
|
||||||
+ prev=
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
release)
|
|
||||||
release="-$arg"
|
|
||||||
prev=
|
|
||||||
@@ -985,6 +991,11 @@
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -inst-prefix-dir)
|
|
||||||
+ prev=inst_prefix
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
||||||
# so, if we see these flags be careful not to treat them like -L
|
|
||||||
-L[A-Z][A-Z]*:*)
|
|
||||||
@@ -1866,6 +1877,7 @@
|
|
||||||
|
|
||||||
if test "$linkmode" = prog || test "$mode" = relink; then
|
|
||||||
add_shlibpath=
|
|
||||||
+ add_prefix_dir=
|
|
||||||
add_dir=
|
|
||||||
add=
|
|
||||||
# Finalize command for both is simple: just hardcode it.
|
|
||||||
@@ -1886,10 +1898,22 @@
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_prefix_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ # add_prefix_dir must be appended instead, otherwise it can
|
|
||||||
+ # possibly be overrided by any hardcoded -L/... path in deplibs
|
|
||||||
if test "$linkmode" = prog; then
|
|
||||||
+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
|
||||||
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
|
||||||
else
|
|
||||||
+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
|
|
||||||
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
|
||||||
test -n "$add" && deplibs="$add $deplibs"
|
|
||||||
fi
|
|
||||||
@@ -3856,7 +3880,7 @@
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# Quote the link command for shipping.
|
|
||||||
- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
|
|
||||||
+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
# Only create the output if not a dry run.
|
|
||||||
@@ -4157,6 +4181,24 @@
|
|
||||||
dir="$dir$objdir"
|
|
||||||
|
|
||||||
if test -n "$relink_command"; then
|
|
||||||
+ # Determine the prefix the user has applied to our future dir.
|
|
||||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
|
||||||
+
|
|
||||||
+ # Don't allow the user to place us outside of our expected
|
|
||||||
+ # location b/c this prevents finding dependent libraries that
|
|
||||||
+ # are installed to the same prefix.
|
|
||||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
|
||||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
||||||
+ exit 1
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ # Stick the inst_prefix_dir data into the link command.
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
||||||
+ else
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
||||||
$show "$relink_command"
|
|
||||||
if $run eval "$relink_command"; then :
|
|
||||||
@ -1,111 +0,0 @@
|
|||||||
--- ltmain.sh Mon Feb 4 15:12:15 2002
|
|
||||||
+++ ltmain.sh Mon Feb 4 15:12:15 2002
|
|
||||||
@@ -745,6 +745,7 @@
|
|
||||||
linker_flags=
|
|
||||||
dllsearchpath=
|
|
||||||
lib_search_path=`pwd`
|
|
||||||
+ inst_prefix_dir=
|
|
||||||
|
|
||||||
avoid_version=no
|
|
||||||
dlfiles=
|
|
||||||
@@ -875,6 +876,11 @@
|
|
||||||
prev=
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
+ inst_prefix)
|
|
||||||
+ inst_prefix_dir="$arg"
|
|
||||||
+ prev=
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
release)
|
|
||||||
release="-$arg"
|
|
||||||
prev=
|
|
||||||
@@ -976,6 +982,11 @@
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ -inst-prefix-dir)
|
|
||||||
+ prev=inst_prefix
|
|
||||||
+ continue
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
||||||
# so, if we see these flags be careful not to treat them like -L
|
|
||||||
-L[A-Z][A-Z]*:*)
|
|
||||||
@@ -1851,7 +1862,16 @@
|
|
||||||
if test "$hardcode_direct" = yes; then
|
|
||||||
add="$libdir/$linklib"
|
|
||||||
elif test "$hardcode_minus_L" = yes; then
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ add_dir=
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+ add_dir="$add_dir -L$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
elif test "$hardcode_shlibpath_var" = yes; then
|
|
||||||
case :$finalize_shlibpath: in
|
|
||||||
@@ -1861,7 +1881,16 @@
|
|
||||||
add="-l$name"
|
|
||||||
else
|
|
||||||
# We cannot seem to hardcode it, guess we'll fake it.
|
|
||||||
- add_dir="-L$libdir"
|
|
||||||
+ # Try looking first in the location we're being installed to.
|
|
||||||
+ add_dir=
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ case "$libdir" in
|
|
||||||
+ [\\/]*)
|
|
||||||
+ add_dir="-L$inst_prefix_dir$libdir"
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+ fi
|
|
||||||
+ add_dir="$add_dir -L$libdir"
|
|
||||||
add="-l$name"
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -3823,7 +3852,7 @@
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# Quote the link command for shipping.
|
|
||||||
- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
|
|
||||||
+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
# Only create the output if not a dry run.
|
|
||||||
@@ -4124,12 +4153,30 @@
|
|
||||||
dir="$dir$objdir"
|
|
||||||
|
|
||||||
if test -n "$relink_command"; then
|
|
||||||
+ # Determine the prefix the user has applied to our future dir.
|
|
||||||
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
|
|
||||||
+
|
|
||||||
+ # Don't allow the user to place us outside of our expected
|
|
||||||
+ # location b/c this prevents finding dependent libraries that
|
|
||||||
+ # are installed to the same prefix.
|
|
||||||
+ if test "$inst_prefix_dir" = "$destdir"; then
|
|
||||||
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
||||||
+ exit 1
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
+ if test -n "$inst_prefix_dir"; then
|
|
||||||
+ # Stick the inst_prefix_dir data into the link command.
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
|
||||||
+ else
|
|
||||||
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
||||||
$show "$relink_command"
|
|
||||||
if $run eval "$relink_command"; then :
|
|
||||||
else
|
|
||||||
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
|
|
||||||
- continue
|
|
||||||
+ exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- ltmain.sh 2002-11-01 19:56:50.000000000 -0600
|
|
||||||
+++ ltmain.sh 2002-11-01 19:57:03.000000000 -0600
|
|
||||||
@@ -4551,6 +4551,8 @@
|
|
||||||
if test "$installed" = yes && test "$D"; then
|
|
||||||
install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
|
|
||||||
fi
|
|
||||||
+ # Removing @REM_INT_DEP@ from dependency_libs in .la
|
|
||||||
+ dependency_libs=`echo $dependency_libs | $Xsed -e 's%\([^ ]*lib@REM_INT_DEP@\.\(so\|la\|a\)\)\|\(-l@REM_INT_DEP@\)%%g'`
|
|
||||||
\$echo > \$output "\\
|
|
||||||
# \$outputname - a libtool library file
|
|
||||||
# Generated by \$PROGRAM - GNU \$PACKAGE \$VERSION\$TIMESTAMP
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- ltmain.sh 2005-05-13 11:48:24.000000000 +0200
|
|
||||||
+++ ltmain.sh 2005-05-13 11:48:42.000000000 +0200
|
|
||||||
@@ -47,6 +47,11 @@
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
+# define variables for historic ltconfig's generated by Libtool 1.3
|
|
||||||
+test -z "$SED" && SED=sed
|
|
||||||
+test -z "$EGREP" && EGREP=egrep
|
|
||||||
+test -z "$LTCC" && LTCC=${CC-gcc}
|
|
||||||
+
|
|
||||||
# The name of this program.
|
|
||||||
progname=`$echo "$0" | sed 's%^.*/%%'`
|
|
||||||
modename="$progname"
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- ltmain.sh 2003-02-13 14:54:24.000000000 +0100
|
|
||||||
+++ ltmain.sh 2003-02-13 15:24:49.000000000 +0100
|
|
||||||
@@ -48,6 +48,11 @@ EOF
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
+# define variables for historic ltconfig's generated by Libtool 1.3
|
|
||||||
+test -z "$SED" && SED=sed
|
|
||||||
+test -z "$EGREP" && EGREP=egrep
|
|
||||||
+test -z "$LTCC" && LTCC=${CC-gcc}
|
|
||||||
+
|
|
||||||
# The name of this program.
|
|
||||||
progname=`$echo "$0" | ${SED} 's%^.*/%%'`
|
|
||||||
modename="$progname"
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
--- ltmain.sh 2005-04-16 16:50:02.000000000 +0200
|
|
||||||
+++ ltmain.sh 2005-04-16 16:46:46.000000000 +0200
|
|
||||||
@@ -39,6 +39,13 @@
|
|
||||||
if [ "x$SED" = x ] ; then
|
|
||||||
SED=sed
|
|
||||||
fi
|
|
||||||
+# Same for EGREP, and just to be sure, do LTCC as well
|
|
||||||
+if test "x$EGREP" = x ; then
|
|
||||||
+ EGREP=egrep
|
|
||||||
+fi
|
|
||||||
+if test "x$LTCC" = x ; then
|
|
||||||
+ LTCC=${CC-gcc}
|
|
||||||
+fi
|
|
||||||
|
|
||||||
# The name of this program:
|
|
||||||
progname=`echo "$progpath" | $SED $basename`
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
Unbreak x86_64-pc-solaris2.1[01], it IS 64-bits too. Without this,
|
|
||||||
libtool thinks the linker is called ld_sol2.
|
|
||||||
|
|
||||||
--- configure
|
|
||||||
+++ configure
|
|
||||||
@@ -1383,7 +1383,7 @@
|
|
||||||
case $lt_cv_prog_gnu_ld in
|
|
||||||
yes*)
|
|
||||||
case $host in
|
|
||||||
- i?86-*-solaris*)
|
|
||||||
+ i?86-*-solaris*|x86_64-*-solaris*)
|
|
||||||
LD="${LD-ld} -m elf_x86_64"
|
|
||||||
;;
|
|
||||||
sparc*-*-solaris*)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- libltdl/config/ltmain.sh
|
|
||||||
+++ libltdl/config/ltmain.sh
|
|
||||||
@@ -1180,7 +1180,7 @@
|
|
||||||
test "$opt_debug" = : || func_append preserve_args " --debug"
|
|
||||||
|
|
||||||
case $host in
|
|
||||||
- *cygwin* | *mingw* | *pw32* | *cegcc*)
|
|
||||||
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*)
|
|
||||||
# don't eliminate duplications in $postdeps and $predeps
|
|
||||||
opt_duplicate_compiler_generated_deps=:
|
|
||||||
;;
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user