[Erp5-report] r40018 luke - /erp5/trunk/buildout/software-profiles/tokyocabinet.cfg

[nobody at svn.erp5.org]

Author: luke
Date: Mon Nov  8 11:42:39 2010
New Revision: 40018

URL: http://svn.erp5.org?rev=40018&view=rev
Log:
 - build against locally provided zlib and bzip2
 - fix self rpath issue by passing rpath to self library

Modified:
    erp5/trunk/buildout/software-profiles/tokyocabinet.cfg

Modified: erp5/trunk/buildout/software-profiles/tokyocabinet.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/tokyocabinet.cfg?rev=40018&r1=40017&r2=40018&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/tokyocabinet.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/tokyocabinet.cfg [utf8] Mon Nov  8 11:42:39 2010
@@ -1,20 +1,17 @@
 [buildout]
+extends =
+  ../software-profiles/bzip2.cfg
+  ../software-profiles/zlib.cfg
 parts = tokyocabinet
 
 [tokyocabinet]
-# XXX-Luke: There is issue when with linking. After building for first time
-# libtokyocabinet.so.9: is not correctly linked with parts/tokyocabinet/bin/tcamgr
-# and others.
-# As workaround please just rebuild, by invoking:
-#  bin/buildout install tokyocabinet
-# Packages depending on tokyocabinet (like flare) are unaffected.
 recipe = hexagonit.recipe.cmmi
 url = http://fallabs.com/tokyocabinet/tokyocabinet-1.4.46.tar.gz
 md5sum = 341dadd1f3d68760e350f7e731111786
 
 configure-options =
-  --enable-zlib
-  --enable-bzip
-# disabled for now - those libraries have to be provided by buildout itself
-#  --enable-pthread
-#  --enable-exlzma
+  --with-zlib=${zlib:location}
+  --with-bzip=${bzip2:location}
+
+environment =
+  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib