[Erp5-report] r40801 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Nov 26 17:26:06 2010
New Revision: 40801

URL: http://svn.erp5.org?rev=40801&view=rev
Log:
add our own curl and use it in git.

Added:
    erp5/trunk/buildout/software-profiles/curl.cfg
Modified:
    erp5/trunk/buildout/software-profiles/git.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Added: erp5/trunk/buildout/software-profiles/curl.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/curl.cfg?rev=40801&view=auto
==============================================================================
--- erp5/trunk/buildout/software-profiles/curl.cfg (added)
+++ erp5/trunk/buildout/software-profiles/curl.cfg [utf8] Fri Nov 26 17:26:06 2010
@@ -0,0 +1,35 @@
+# libcurl - the multiprotocol file transfer library
+
+[buildout]
+extends =
+  ../software-profiles/openssl.cfg
+  ../software-profiles/zlib.cfg
+parts =
+  curl
+
+[curl]
+recipe = hexagonit.recipe.cmmi
+url = http://curl.haxx.se/download/curl-7.21.2.tar.bz2
+md5sum = ca96df88e044c7c25d19692ec8b250b2
+configure-options =
+  --disable-ldap
+  --disable-ldaps
+  --disable-rtsp
+  --disable-proxy
+  --disable-dict
+  --disable-telnet
+  --disable-tftp
+  --disable-pop3
+  --disable-imap
+  --disable-smtp
+  --disable-gopher
+  --enable-ipv6
+  --disable-sspi
+  --with-ssl=${openssl:location}
+  --with-zlib=${zlib:location}
+  --without-nss
+  --without-libssh2
+  --without-libidn
+
+environment =
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/software-profiles/git.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/git.cfg?rev=40801&r1=40800&r2=40801&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/git.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/git.cfg [utf8] Fri Nov 26 17:26:06 2010
@@ -1,5 +1,7 @@
 [buildout]
 extends =
+  ../software-profiles/curl.cfg
+  ../software-profiles/libexpat.cfg
   ../software-profiles/openssl.cfg
   ../software-profiles/zlib.cfg
 parts =
@@ -10,7 +12,10 @@ recipe = hexagonit.recipe.cmmi
 url = http://kernel.org/pub/software/scm/git/git-1.7.3.2.tar.bz2
 md5sum = 902f7f07a789fedc0d2ac03656b85969
 configure-options =
+  --with-curl=${curl:location}
   --with-openssl=${openssl:location}
+  --with-zlib=${zlib:location}
+  --with-expat=${libexpat:location}
   --without-tcltk
 
 environment =

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40801&r1=40800&r2=40801&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Fri Nov 26 17:26:06 2010
@@ -2096,6 +2096,54 @@ class AssertLibuuid(AssertSoftwareMixin)
       ],
       [])
 
+class AssertCurl(AssertSoftwareMixin):
+  def test_ld_curl(self):
+    self.assertLibraryList('parts/curl/bin/curl', [
+      'libc',
+      'libcurl',
+      'librt',
+      'libz',
+      ], [
+      'curl',
+      'openssl',
+      'zlib',
+      ])
+  def test_ld_libcurl(self):
+    self.assertLibraryList('parts/curl/lib/libcurl.so', [
+      'libc',
+      'libcrypto',
+      'libdl',
+      'librt',
+      'libssl',
+      'libz',
+      ], [
+      'openssl',
+      'zlib',
+      ])
+
+class AssertGit(AssertSoftwareMixin):
+  def test_ld_git(self):
+    self.assertLibraryList('parts/git/bin/git', [
+      'libc',
+      'libcrypto',
+      'libpthread',
+      'libz',
+      ], [
+      'openssl',
+      'zlib',
+      ])
+  def test_ld_git_http_fetch(self):
+    self.assertLibraryList('parts/git/libexec/git-core/git-http-fetch', [
+      'libc',
+      'libcrypto',
+      'libcurl',
+      'libpthread',
+      'libz',
+      ], [
+      'curl',
+      'openssl',
+      'zlib',
+      ])
 
 class AssertElfLinkedInternally(AssertSoftwareMixin):
   def test(self):