Index: files/patch-libltdl_config_ltmain.m4sh =================================================================== --- files/patch-libltdl_config_ltmain.m4sh (révision 0) +++ files/patch-libltdl_config_ltmain.m4sh (copie de travail) @@ -0,0 +1,64 @@ +--- libltdl/config/ltmain.m4sh.orig 2011-10-17 12:17:05.000000000 +0200 ++++ libltdl/config/ltmain.m4sh 2013-12-12 22:10:05.655556993 +0100 +@@ -6544,13 +6544,18 @@ func_mode_link () + # + case $version_type in + # correct linux to gnu/linux during the next big refactor +- darwin|linux|osf|windows|none) +- func_arith $number_major + $number_minor +- current=$func_arith_result +- age="$number_minor" +- revision="$number_revision" ++ darwin|linux|osf|windows|none|freebsd-aout|freebsd-elf) ++ if [ -z "${LTVERHACK}" ]; then ++ func_arith $number_major + $number_minor ++ current=$func_arith_result ++ age="$number_minor" ++ revision="$number_revision" ++ else ++ major=".$current" ++ versuffix=".$current.$revision"; ++ fi + ;; +- freebsd-aout|freebsd-elf|qnx|sunos) ++ qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" +@@ -6621,16 +6626,6 @@ func_mode_link () + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + +- freebsd-aout) +- major=".$current" +- versuffix=".$current.$revision"; +- ;; +- +- freebsd-elf) +- major=".$current" +- versuffix=".$current" +- ;; +- + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age +@@ -6660,10 +6655,15 @@ func_mode_link () + versuffix="$major.$revision" + ;; + +- linux) # correct to gnu/linux during the next big refactor +- func_arith $current - $age +- major=.$func_arith_result +- versuffix="$major.$age.$revision" ++ linux|freebsd-aout|freebsd-elf) ++ if [ -z "${LTVERHACK}" ]; then ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix="$major.$age.$revision" ++ else ++ major=".$current" ++ versuffix=".$current" ++ fi + ;; + + osf) Modification de propriétés sur files/patch-libltdl_config_ltmain.m4sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-libltdl_config_ltmain.sh =================================================================== --- files/patch-libltdl_config_ltmain.sh (révision 339342) +++ files/patch-libltdl_config_ltmain.sh (copie de travail) @@ -1,6 +1,8 @@ ---- libltdl/config/ltmain.sh.orig 2010-09-22 09:45:43.000000000 -0500 -+++ libltdl/config/ltmain.sh 2011-01-18 12:59:46.000000000 -0600 -@@ -1376,2 +1376,17 @@ +--- libltdl/config/ltmain.sh.orig 2011-10-17 12:19:35.000000000 +0200 ++++ libltdl/config/ltmain.sh 2013-12-12 22:10:54.484556884 +0100 +@@ -1375,6 +1375,21 @@ func_replace_sysroot () + func_infer_tag () + { $opt_debug + + # FreeBSD-specific: where we install compilers with non-standard names @@ -18,7 +20,11 @@ + fi + if test -n "$available_tags" && test -z "$tagname"; then -@@ -1412,3 +1427,18 @@ + CC_quoted= + for arg in $CC; do +@@ -1411,7 +1426,22 @@ func_infer_tag () + break + ;; esac - fi + @@ -38,46 +44,67 @@ + fi + fi done -@@ -3516,2 +3546,5 @@ - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) -@@ -5585,2 +5618,3 @@ - esac -+ deplibs="$deplibs $arg" - continue -@@ -6155,9 +6189,26 @@ - func_append compiler_flags " $deplib" -- if test "$linkmode" = lib ; then -- case "$new_inherited_linker_flags " in -- *" $deplib "*) ;; -- * ) func_append new_inherited_linker_flags " $deplib" ;; -- esac -- fi - fi -+ -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command +@@ -7331,13 +7382,18 @@ func_mode_link () + # + case $version_type in + # correct linux to gnu/linux during the next big refactor +- darwin|linux|osf|windows|none) +- func_arith $number_major + $number_minor +- current=$func_arith_result +- age="$number_minor" +- revision="$number_revision" ++ darwin|linux|osf|windows|none|freebsd-aout|freebsd-elf) ++ if [ -z "${LTVERHACK}" ]; then ++ func_arith $number_major + $number_minor ++ current=$func_arith_result ++ age="$number_minor" ++ revision="$number_revision" + else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" ++ major=".$current" ++ versuffix=".$current.$revision"; + fi -+ ;; -+ *) -+ ;; -+ esac # linkmode -+ - continue + ;; +- freebsd-aout|freebsd-elf|qnx|sunos) ++ qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" +@@ -7408,16 +7464,6 @@ func_mode_link () + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + +- freebsd-aout) +- major=".$current" +- versuffix=".$current.$revision"; +- ;; +- +- freebsd-elf) +- major=".$current" +- versuffix=".$current" +- ;; +- + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age +@@ -7447,10 +7493,15 @@ func_mode_link () + versuffix="$major.$revision" + ;; + +- linux) # correct to gnu/linux during the next big refactor +- func_arith $current - $age +- major=.$func_arith_result +- versuffix="$major.$age.$revision" ++ linux|freebsd-aout|freebsd-elf) ++ if [ -z "${LTVERHACK}" ]; then ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix="$major.$age.$revision" ++ else ++ major=".$current" ++ versuffix=".$current" ++ fi + ;; + + osf)