[Checkins] SVN: z3c.recipe.staticlxml/trunk/ - Passing include-dirs, library-dirs and rpath newline separated as required

Christian Zagrodnick cz at gocept.com
Wed Apr 8 14:07:45 EDT 2009


Log message for revision 99014:
  - Passing include-dirs, library-dirs and rpath newline separated as required
    by zc.recipe.egg. This fixes non static build on linux.  [zagy]
  
  

Changed:
  U   z3c.recipe.staticlxml/trunk/CHANGES.txt
  U   z3c.recipe.staticlxml/trunk/CONTRIBUTORS.txt
  U   z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py

-=-
Modified: z3c.recipe.staticlxml/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.staticlxml/trunk/CHANGES.txt	2009-04-08 17:44:59 UTC (rev 99013)
+++ z3c.recipe.staticlxml/trunk/CHANGES.txt	2009-04-08 18:07:45 UTC (rev 99014)
@@ -1,7 +1,8 @@
 Trunk
 =====
 
-no changes yet
+- Passing include-dirs, library-dirs and rpath newline separated as required
+  by zc.recipe.egg. This fixes non static build on linux.  [zagy]
 
 0.6 (2009-03-19)
 ================

Modified: z3c.recipe.staticlxml/trunk/CONTRIBUTORS.txt
===================================================================
--- z3c.recipe.staticlxml/trunk/CONTRIBUTORS.txt	2009-04-08 17:44:59 UTC (rev 99013)
+++ z3c.recipe.staticlxml/trunk/CONTRIBUTORS.txt	2009-04-08 18:07:45 UTC (rev 99014)
@@ -1,3 +1,3 @@
 Stefan Eletzhofer, Author
 Reinout van Rees
-
+Christian Zagrodnick

Modified: z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py
===================================================================
--- z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py	2009-04-08 17:44:59 UTC (rev 99013)
+++ z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py	2009-04-08 18:07:45 UTC (rev 99014)
@@ -175,18 +175,15 @@
         if not os.path.exists(dest):
             os.mkdir(dest)
 
-        options["include-dirs"] = "%s %s" % (
-                os.path.join(self.xml2_location, "include", "libxml2"),
-                os.path.join(self.xslt_location, "include"),
-                )
-        options["library-dirs"] = "%s %s" % (
+        options["include-dirs"] = '\n'.join([
+            os.path.join(self.xml2_location, "include", "libxml2"),
+            os.path.join(self.xslt_location, "include")])
+        options["library-dirs"] = '\n'.join([
                 os.path.join(self.xml2_location, "lib"),
-                os.path.join(self.xslt_location, "lib"),
-                )
-        options["rpath"] = "%s %s" % (
+                os.path.join(self.xslt_location, "lib")])
+        options["rpath"] = '\n'.join([
                 os.path.join(self.xml2_location, "lib"),
-                os.path.join(self.xslt_location, "lib"),
-                )
+                os.path.join(self.xslt_location, "lib")])
 
         if "darwin" in sys.platform:
             self.logger.warn("Adding ``iconv`` to libs due to a lxml setup bug.")



More information about the Checkins mailing list