[Erp5-report] r45323 luke - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Tue Apr 12 11:18:31 2011
New Revision: 45323

URL: http://svn.erp5.org?rev=45323&view=rev
Log:
 - jar is used during gcc-java compilation, so use own provided version

Added:
    erp5/trunk/buildout/software-profiles/fastjar.cfg
Modified:
    erp5/trunk/buildout/software-profiles/gcc.cfg
    erp5/trunk/buildout/software-profiles/pdftk.cfg

Added: erp5/trunk/buildout/software-profiles/fastjar.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/fastjar.cfg?rev=45323&view=auto
==============================================================================
--- erp5/trunk/buildout/software-profiles/fastjar.cfg (added)
+++ erp5/trunk/buildout/software-profiles/fastjar.cfg [utf8] Tue Apr 12 11:18:31 2011
@@ -0,0 +1,12 @@
+[buildout]
+parts = fastjar
+extends =
+  zlib.cfg
+
+[fastjar]
+recipe = hexagonit.recipe.cmmi
+url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
+md5sum = 14d4bdfac236e347d806c6743dba48c6
+environment =
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/software-profiles/gcc.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/gcc.cfg?rev=45323&r1=45322&r2=45323&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/gcc.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/gcc.cfg [utf8] Tue Apr 12 11:18:31 2011
@@ -2,6 +2,7 @@
 # Mostly required to support languages different then C or C++
 [buildout]
 extends =
+  fastjar.cfg
   m4.cfg
   zip.cfg
 
@@ -91,4 +92,4 @@ configure-options =
 environment =
   CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
   LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath -Wl,${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib -Wl,-rpath -Wl,${mpc:location}/lib
-  PATH=${zip:location}/bin:%(PATH)s
+  PATH=${fastjar:location}/bin:${zip:location}/bin:%(PATH)s

Modified: erp5/trunk/buildout/software-profiles/pdftk.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/pdftk.cfg?rev=45323&r1=45322&r2=45323&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/pdftk.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/pdftk.cfg [utf8] Tue Apr 12 11:18:31 2011
@@ -4,8 +4,8 @@
 # Because of this the only way to have portable pdftk profile it is required
 # to provide working gcj and then have it used for pdftk compilation.
 extends =
+  fastjar.cfg
   gcc.cfg
-  zlib.cfg
 
 parts = pdftk
 
@@ -26,14 +26,6 @@ filename = pdftk-hooks.py
 md5sum = b4b4a31ded6b59888e2a56d1b5726c99
 download-only = true
 
-[fastjar]
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
-md5sum = 14d4bdfac236e347d806c6743dba48c6
-environment =
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
-
 [pdftk]
 recipe = hexagonit.recipe.cmmi
 url = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.44-src.zip