- tag and mode options are reversed

[packages/akode.git] / kde-common-PLD.patch

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 7aaf479fcea5a9987d0856cdd8a75c91e7db74e5..2664ad8c1268f9396150e5e0cb66c7653693df5e 100644 (file)
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -118,14 +118,13 @@
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
-
 --- kdelibs-3.5.4/admin/am_edit        2006-07-24 10:18:33.000000000 +0300
-+++ kdepim-3.5.4/admin/am_edit 2006-09-19 14:20:21.446444147 +0300
-@@ -499,6 +498,11 @@
++++ gwenview-1.4.0/admin/am_edit       2006-09-25 00:04:55.213036950 +0300
+@@ -499,6 +499,11 @@
          }
      }
  
-+    $lookup = '(CXXLINK = \$\(LIBTOOL\) --tag=CXX --mode=link) \$\(CXXLD\)';
++    $lookup = '(CXXLINK = \$\(LIBTOOL\) --mode=link --tag=CXX) \$\(CXXLD\)';
 +    if ($MakefileData =~ m/$lookup/) {
 +        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
 +    }
@@ -133,3 +132,18 @@
      $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
  
      $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +583,14 @@
+         local @kde_options = split(/[\034\s]+/, $kde_options_str);
+         if (grep(/^foreign$/, @kde_options)) {
+             push(@foreignfiles, $makefileDir . "/");
++
++            # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
++            $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
++            if ($MakefileData =~ m/$lookup/) {
++                substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++                updateMakefile ();
++            }
++
+             return 0; # don't touch me
+         }
+         for $opt (@kde_options) {