diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2011-02-25 06:15:44 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2011-02-25 06:15:44 +0000 |
| commit | e0d39220da70d4549cd2c80f3e1aa7f10013ffeb (patch) | |
| tree | e1bec5b72ac74951b3de76134222d19cbadc67fc /devel/libtool/files/patch-libltdl_config_ltmain.sh | |
| parent | - remove 'if ${PYTHON_REL} < 250', since USE_PYTHON= 2.5+ (diff) | |
Update to libtool 2.4
Tested by: pav (multiple -exp runs)
Notes
Notes:
svn path=/head/; revision=269656
Diffstat (limited to 'devel/libtool/files/patch-libltdl_config_ltmain.sh')
| -rw-r--r-- | devel/libtool/files/patch-libltdl_config_ltmain.sh | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/devel/libtool/files/patch-libltdl_config_ltmain.sh b/devel/libtool/files/patch-libltdl_config_ltmain.sh index ad0599710598..4bc3bf1c120a 100644 --- a/devel/libtool/files/patch-libltdl_config_ltmain.sh +++ b/devel/libtool/files/patch-libltdl_config_ltmain.sh @@ -1,8 +1,6 @@ ---- libltdl/config/ltmain.sh.orig 2009-06-29 12:36:19.000000000 -0500 -+++ libltdl/config/ltmain.sh 2009-06-29 12:57:44.000000000 -0500 -@@ -1010,6 +1010,21 @@ - func_infer_tag () - { +--- 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 @@ $opt_debug + + # FreeBSD-specific: where we install compilers with non-standard names @@ -20,11 +18,7 @@ + fi + if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -@@ -1042,7 +1057,22 @@ - break - ;; +@@ -1412,3 +1427,18 @@ esac - fi + @@ -44,34 +38,22 @@ + fi + fi done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command -@@ -2528,6 +2558,9 @@ - ;; - esac +@@ -3516,2 +3546,5 @@ ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; -@@ -4584,6 +4617,7 @@ - *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; +@@ -5585,2 +5618,3 @@ esac + deplibs="$deplibs $arg" continue - ;; - -@@ -5073,13 +5107,30 @@ - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" +@@ -6155,9 +6189,26 @@ + func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; +- * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi fi @@ -99,5 +81,3 @@ + esac # linkmode + continue - ;; - -l*) |