[packages/sip] - one more fix in outoftree patch (VPATH support for moc rules, needed for PyQt4 out-of-tree build)

qboosh qboosh at pld-linux.org
Wed Oct 29 21:32:32 CET 2014


commit 1209df64d5efc4ed6911eee6564f3bf84b449f67
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 29 21:32:32 2014 +0100

    - one more fix in outoftree patch (VPATH support for moc rules, needed for PyQt4 out-of-tree build)
    - release 2

 sip-outoftree.patch | 9 +++++++++
 sip.spec            | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/sip.spec b/sip.spec
index 192efaa..2e61ad2 100644
--- a/sip.spec
+++ b/sip.spec
@@ -8,7 +8,7 @@ Summary:	Python bindings generator for C++ class libraries
 Summary(pl.UTF-8):	Generator powiązań Pythona z bibliotekami klas C++
 Name:		sip
 Version:	4.16.4
-Release:	1
+Release:	2
 Epoch:		2
 License:	SIP (redistributable, see LICENSE) or GPL v2 or GPL v3
 Group:		Development/Languages/Python
diff --git a/sip-outoftree.patch b/sip-outoftree.patch
index fc08abb..2a90e69 100644
--- a/sip-outoftree.patch
+++ b/sip-outoftree.patch
@@ -84,3 +84,12 @@
  
          self._build = self.parse_build_file(build_file)
          self._install_dir = install_dir
+@@ -1677,7 +1683,7 @@
+             cpp = "moc_" + root + ".cpp"
+ 
+             mfile.write("\n%s: %s\n" % (cpp, mf))
+-            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
++            mfile.write("\t$(MOC) -o %s $<\n" % cpp)
+ 
+         mfile.write("\n$(TARGET): $(OFILES)\n")
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sip.git/commitdiff/1209df64d5efc4ed6911eee6564f3bf84b449f67



More information about the pld-cvs-commit mailing list