SOURCES: kde-common-LD_quote.patch (NEW) - split out from kde-comm...

[glen]

Author: glen                         Date: Thu Oct 12 14:51:21 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- split out from kde-common-PLD

---- Files affected:
SOURCES:
   kde-common-LD_quote.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kde-common-LD_quote.patch
diff -u /dev/null SOURCES/kde-common-LD_quote.patch:1.1
--- /dev/null	Thu Oct 12 16:51:21 2006
+++ SOURCES/kde-common-LD_quote.patch	Thu Oct 12 16:51:16 2006
@@ -0,0 +1,33 @@
+--- gwenview-1.4.0/admin/am_edit	2006-09-25 00:04:55.213036950 +0300
++++ kdelibs-3.5.5/admin/am_edit	2006-10-03 11:40:08.052152886 +0300
+@@ -499,6 +499,15 @@
+         }
+     }
+ 
++    $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++    }
++    $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
++    }
++
+     $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
+ 
+     $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +587,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) {
================================================================