diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-09-15 06:53:45 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-09-15 06:53:45 +0000 |
| commit | 648cf6a75e67359799eeff70c3382b176992668d (patch) | |
| tree | d2320c08708331b143e6567563e61cee0b393d1f /eclass/ELT-patches/ltmain | |
| parent | Version bump as requested by upstream. (diff) | |
| download | gentoo-2-648cf6a75e67359799eeff70c3382b176992668d.tar.gz gentoo-2-648cf6a75e67359799eeff70c3382b176992668d.tar.bz2 gentoo-2-648cf6a75e67359799eeff70c3382b176992668d.zip | |
Fix the -pthread issue in .la files once and for all for crappy old libtools
Diffstat (limited to 'eclass/ELT-patches/ltmain')
| -rw-r--r-- | eclass/ELT-patches/ltmain/1.5 | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/eclass/ELT-patches/ltmain/1.5 b/eclass/ELT-patches/ltmain/1.5 index 1f220331bf06..39abee03efa1 100644 --- a/eclass/ELT-patches/ltmain/1.5 +++ b/eclass/ELT-patches/ltmain/1.5 @@ -1,40 +1,18 @@ -Fixes #182214 -Hopefully KDE4 will solve this for us FreeBSD users. - ---- ltmain.sh 2007-09-13 16:00:38 +0100 +--- ltmain.sh 2007-09-15 07:35:19 +0100 +++ ltmain.sh 2004-01-25 12:40:26 +0000 -@@ -2083,17 +2059,6 @@ - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" -- tmp_libs= -- for deplib in $dependency_libs; do -- #echo "Adding $deplib to \$deplibs" -- deplibs="$deplib $deplibs" -- if test "X$duplicate_deps" = "Xyes" ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -@@ -2102,6 +2067,16 @@ - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit 1 +@@ -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 |