Merge branch 'erp5' into erp5-generic

8cfa4bc0 · Łukasz Nowak · e6230b9d · 5f664ec6 · 8cfa4bc0 · 8cfa4bc0
Commit 8cfa4bc0 authored Oct 25, 2011 by Łukasz Nowak
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

component/freetype/buildout.cfg component/freetype/buildout.cfg +2 -2

component/grep/buildout.cfg component/grep/buildout.cfg +4 -4

No files found.
--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -10,8 +10,8 @@ parts =
 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.7.tar.bz2
-md5sum = 5e6510613f612809d2d7862592b92ab7
+md5sum = dbadce8f0c5e70a0b7c51eadf2dd9394
 configure-options =
  --disable-static
 environment =

--- a/component/grep/buildout.cfg
+++ b/component/grep/buildout.cfg
@@ -6,8 +6,8 @@ parts =
 [grep]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.8.tar.gz
+url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
-md5sum = cb2dfc502c5afc7a4a6e5f6cefd6850e
+md5sum = 03e3451a38b0d615cb113cbeaf252dc0
 environment =
-  PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
+  CPPFLAGS=-I${pcre:location}/include
-  LDFLAGS =-Wl,--as-needed -Wl,-rpath=${pcre:location}/lib
+  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib