From 8a5bffed7f0d4695420d3fbd09135e533bcba9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Tue, 12 Apr 2011 09:18:31 +0000
Subject: [PATCH] - jar is used during gcc-java compilation, so use own
provided version
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45323 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
buildout/software-profiles/fastjar.cfg | 12 ++++++++++++
buildout/software-profiles/gcc.cfg | 3 ++-
buildout/software-profiles/pdftk.cfg | 10 +---------
3 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 buildout/software-profiles/fastjar.cfg
diff --git a/buildout/software-profiles/fastjar.cfg b/buildout/software-profiles/fastjar.cfg
new file mode 100644
index 0000000000..282aa13173
--- /dev/null
+++ b/buildout/software-profiles/fastjar.cfg
@@ -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
diff --git a/buildout/software-profiles/gcc.cfg b/buildout/software-profiles/gcc.cfg
index 822312c27b..27d8a71650 100644
--- a/buildout/software-profiles/gcc.cfg
+++ b/buildout/software-profiles/gcc.cfg
@@ -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
diff --git a/buildout/software-profiles/pdftk.cfg b/buildout/software-profiles/pdftk.cfg
index 3e3e47e14e..9fae93d89a 100644
--- a/buildout/software-profiles/pdftk.cfg
+++ b/buildout/software-profiles/pdftk.cfg
@@ -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
--
2.30.9