[Erp5-report] r37175 luke - in /erp5/trunk/buildout: profiles/ software-profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jul 16 16:38:01 2010
New Revision: 37175

URL: http://svn.erp5.org?rev=37175&view=rev
Log:
 - workaround http://github.com/hexagonit/hexagonit.recipe.cmmi/issues#issue/1 by resetting environment (works only in default buildout run)
 - reorganise parts a bit to have control over reseted environment

Modified:
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/imagemagick.cfg
    erp5/trunk/buildout/software-profiles/ocropus.cfg
    erp5/trunk/buildout/software-profiles/xpdf.cfg

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=37175&r1=37174&r2=37175&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Fri Jul 16 16:38:01 2010
@@ -35,17 +35,17 @@ versions = versions
 
 parts =
   eggs
+  rdiff-backup
   apache
   memcached
-  rdiff-backup
   ocropus
   haproxy
   varnish
   flare
   w3m
   xpdf
-  imagemagick
   mysql-tritonn-5.0
+  imagemagick
   zope-2.8
   cmf15
   itools

Modified: erp5/trunk/buildout/software-profiles/imagemagick.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/imagemagick.cfg?rev=37175&r1=37174&r2=37175&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Fri Jul 16 16:38:01 2010
@@ -4,3 +4,10 @@ parts = imagemagick
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.nluug.nl/ImageMagick/ImageMagick-6.6.2-4.tar.gz
+
+# workaround http://github.com/hexagonit/hexagonit.recipe.cmmi/issues#issue/1
+# in typical buildout run
+environment =
+  CFLAGS =
+  CXXFLAGS =
+  LDFLAGS =

Modified: erp5/trunk/buildout/software-profiles/ocropus.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ocropus.cfg?rev=37175&r1=37174&r2=37175&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ocropus.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ocropus.cfg [utf8] Fri Jul 16 16:38:01 2010
@@ -16,6 +16,10 @@ configure-options =
   ${iulib:location}
 patches = ${ocropus-patch-scons:location}/${ocropus-patch-scons:filename}
 patch-options = -p1
+# workaround http://github.com/hexagonit/hexagonit.recipe.cmmi/issues#issue/1
+# in typical buildout run
+environment =
+  LDFLAGS =
 
 [iulib]
 recipe = hexagonit.recipe.cmmi

Modified: erp5/trunk/buildout/software-profiles/xpdf.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/xpdf.cfg?rev=37175&r1=37174&r2=37175&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/xpdf.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/xpdf.cfg [utf8] Fri Jul 16 16:38:01 2010
@@ -39,3 +39,10 @@ patches =
   ${xpdf-3.02pl2.patch:location}/${xpdf-3.02pl2.patch:filename}
   ${xpdf-3.02pl3.patch:location}/${xpdf-3.02pl3.patch:filename}
   ${xpdf-3.02pl4.patch:location}/${xpdf-3.02pl4.patch:filename}
+
+# workaround http://github.com/hexagonit/hexagonit.recipe.cmmi/issues#issue/1
+# in typical buildout run
+environment =
+  LDFLAGS =
+
+