SOURCES: kde-common-PLD.patch - more hacking

[glen]

Author: glen                         Date: Tue Sep 19 21:18:42 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- more hacking

---- Files affected:
SOURCES:
   kde-common-PLD.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/kde-common-PLD.patch
diff -u SOURCES/kde-common-PLD.patch:1.7 SOURCES/kde-common-PLD.patch:1.8
--- SOURCES/kde-common-PLD.patch:1.7	Tue Sep 19 22:39:04 2006
+++ SOURCES/kde-common-PLD.patch	Tue Sep 19 23:18:37 2006
@@ -118,10 +118,9 @@
  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 @@
+--- kdepim-3.5.4/admin/am_edit	2006-09-19 14:20:21.446444147 +0300
++++ kdepim-3.5.4/admin/am_edit	2006-09-20 00:14:49.967386769 +0300
+@@ -498,6 +498,11 @@
          }
      }
  
@@ -133,3 +132,18 @@
      $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
  
      $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -573,6 +578,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) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kde-common-PLD.patch?r1=1.7&r2=1.8&f=u