]> git.pld-linux.org Git - packages/scribus.git/commitdiff
- split out from kde-common-PLD auto/ac/ktorrent-2_0_3-1 auto/ac/ktorrent-2_0_3-2 auto/th/libkipi-0_1_4-2
authorElan Ruusamäe <glen@pld-linux.org>
Thu, 12 Oct 2006 14:51:16 +0000 (14:51 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    kde-common-LD_quote.patch -> 1.1

kde-common-LD_quote.patch [new file with mode: 0644]

diff --git a/kde-common-LD_quote.patch b/kde-common-LD_quote.patch
new file mode 100644 (file)
index 0000000..7d65c3f
--- /dev/null
@@ -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) {
This page took 0.073852 seconds and 4 git commands to generate.