SOURCES: kde-common-PLD.patch - also adjust LINK for quotes

glen glen at pld-linux.org
Tue Oct 3 12:43:26 CEST 2006


Author: glen                         Date: Tue Oct  3 10:43:26 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- also adjust LINK for quotes

---- Files affected:
SOURCES:
   kde-common-PLD.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/kde-common-PLD.patch
diff -u SOURCES/kde-common-PLD.patch:1.9 SOURCES/kde-common-PLD.patch:1.10
--- SOURCES/kde-common-PLD.patch:1.9	Sun Sep 24 23:08:41 2006
+++ SOURCES/kde-common-PLD.patch	Tue Oct  3 12:43:21 2006
@@ -118,21 +118,25 @@
  AC_MSG_RESULT($QTDOCDIR)
  
  AC_SUBST(QTDOCDIR)
---- kdelibs-3.5.4/admin/am_edit	2006-07-24 10:18:33.000000000 +0300
-+++ gwenview-1.4.0/admin/am_edit	2006-09-25 00:04:55.213036950 +0300
-@@ -499,6 +499,11 @@
+--- 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 --tag=CXX) \$\(CXXLD\)';
++    $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 +583,14 @@
+@@ -578,6 +587,14 @@
          local @kde_options = split(/[\034\s]+/, $kde_options_str);
          if (grep(/^foreign$/, @kde_options)) {
              push(@foreignfiles, $makefileDir . "/");
================================================================

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



More information about the pld-cvs-commit mailing list