| 1 |
uberlord 07/09/15 06:53:46 |
| 2 |
|
| 3 |
Modified: 1.5 |
| 4 |
Log: |
| 5 |
Fix the -pthread issue in .la files once and for all for crappy old libtools |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 eclass/ELT-patches/ltmain/1.5 |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/ltmain/1.5?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/ltmain/1.5?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/ltmain/1.5?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: 1.5 |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ELT-patches/ltmain/1.5,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- 1.5 14 Sep 2007 06:49:46 -0000 1.1 |
| 21 |
+++ 1.5 15 Sep 2007 06:53:45 -0000 1.2 |
| 22 |
@@ -1,40 +1,18 @@ |
| 23 |
-Fixes #182214 |
| 24 |
-Hopefully KDE4 will solve this for us FreeBSD users. |
| 25 |
- |
| 26 |
---- ltmain.sh 2007-09-13 16:00:38 +0100 |
| 27 |
+--- ltmain.sh 2007-09-15 07:35:19 +0100 |
| 28 |
+++ ltmain.sh 2004-01-25 12:40:26 +0000 |
| 29 |
-@@ -2083,17 +2059,6 @@ |
| 30 |
- if test "$pass" = conv; then |
| 31 |
- # Only check for convenience libraries |
| 32 |
- deplibs="$lib $deplibs" |
| 33 |
-- tmp_libs= |
| 34 |
-- for deplib in $dependency_libs; do |
| 35 |
-- #echo "Adding $deplib to \$deplibs" |
| 36 |
-- deplibs="$deplib $deplibs" |
| 37 |
-- if test "X$duplicate_deps" = "Xyes" ; then |
| 38 |
-- case "$tmp_libs " in |
| 39 |
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 40 |
-- esac |
| 41 |
-- fi |
| 42 |
-- tmp_libs="$tmp_libs $deplib" |
| 43 |
-- done |
| 44 |
- if test -z "$libdir"; then |
| 45 |
- if test -z "$old_library"; then |
| 46 |
- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 |
| 47 |
-@@ -2102,6 +2067,16 @@ |
| 48 |
- # It is a libtool convenience library, so add in its objects. |
| 49 |
- convenience="$convenience $ladir/$objdir/$old_library" |
| 50 |
- old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 51 |
-+ tmp_libs= |
| 52 |
-+ for deplib in $dependency_libs; do |
| 53 |
-+ deplibs="$deplib $deplibs" |
| 54 |
-+ if test "X$duplicate_deps" = "Xyes" ; then |
| 55 |
-+ case "$tmp_libs " in |
| 56 |
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 57 |
-+ esac |
| 58 |
-+ fi |
| 59 |
-+ tmp_libs="$tmp_libs $deplib" |
| 60 |
-+ done |
| 61 |
- elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 62 |
- $echo "$modename: \`$lib' is not a convenience library" 1>&2 |
| 63 |
- exit 1 |
| 64 |
+@@ -1854,6 +1840,15 @@ |
| 65 |
+ lib= |
| 66 |
+ found=no |
| 67 |
+ case $deplib in |
| 68 |
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) |
| 69 |
++ if test "$linkmode,$pass" = "prog,link"; then |
| 70 |
++ compile_deplibs="$deplib $compile_deplibs" |
| 71 |
++ finalize_deplibs="$deplib $finalize_deplibs" |
| 72 |
++ else |
| 73 |
++ deplibs="$deplib $deplibs" |
| 74 |
++ fi |
| 75 |
++ continue |
| 76 |
++ ;; |
| 77 |
+ -l*) |
| 78 |
+ if test "$linkmode" != lib && test "$linkmode" != prog; then |
| 79 |
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
-- |
| 84 |
gentoo-commits@g.o mailing list |
Archives