summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-09-14 06:49:46 +0000
committerRoy Marples <uberlord@gentoo.org>2007-09-14 06:49:46 +0000
commit48817f7f2f5ea53f0099edfa3181053887ab5b55 (patch)
tree872750b0e1784e407e80728b24a2321b55df08fa /eclass/ELT-patches
parentversion bump; upstream bug fixes; and a typo in the ebuild, thanks to Sebasti... (diff)
downloadgentoo-2-48817f7f2f5ea53f0099edfa3181053887ab5b55.tar.gz
gentoo-2-48817f7f2f5ea53f0099edfa3181053887ab5b55.tar.bz2
gentoo-2-48817f7f2f5ea53f0099edfa3181053887ab5b55.zip
Add a patch for ltmain.sh-1.5 so that KDE ebuilds link correctly on FreeBSD, #182214
Diffstat (limited to 'eclass/ELT-patches')
-rw-r--r--eclass/ELT-patches/ltmain/1.540
1 files changed, 40 insertions, 0 deletions
diff --git a/eclass/ELT-patches/ltmain/1.5 b/eclass/ELT-patches/ltmain/1.5
new file mode 100644
index 000000000000..1f220331bf06
--- /dev/null
+++ b/eclass/ELT-patches/ltmain/1.5
@@ -0,0 +1,40 @@
+Fixes #182214
+Hopefully KDE4 will solve this for us FreeBSD users.
+
+--- ltmain.sh 2007-09-13 16:00:38 +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