diff --git a/buildout/software-profiles/curl.cfg b/buildout/software-profiles/curl.cfg new file mode 100644 index 0000000000000000000000000000000000000000..26614152f3a1211cd0dd17e33ff4dd69c1354d39 --- /dev/null +++ b/buildout/software-profiles/curl.cfg @@ -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 diff --git a/buildout/software-profiles/git.cfg b/buildout/software-profiles/git.cfg index fba8b2a25d29c3e15b3cc4c3ad02160fb2e6a75a..e646c4f85739b3fac0993882a274bb436fe40046 100644 --- a/buildout/software-profiles/git.cfg +++ b/buildout/software-profiles/git.cfg @@ -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 = diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index b0917f07486972d1c4894caa72384dfd1d8777a3..ef80ed7ca4e540fab746e1ff2b9689444d7f1140 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -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):