Merge pull request #13357 from zimbatm/curl-7.15-fixup

curl: fixes installation of 7.15
This commit is contained in:
Robin Gloster 2016-02-22 01:19:17 +00:00
commit 60290c69e4
2 changed files with 16 additions and 0 deletions

View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3";
};
patches = [ ./disable-ca-install.patch ];
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
# "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl.

View File

@ -0,0 +1,14 @@
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -106,10 +106,7 @@ else
endif
install-data-hook:
- @if test -n "@CURL_CA_BUNDLE@"; then \
- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
- fi
+ echo "install-data-hook disabled"
# this hook is mainly for non-unix systems to build even if configure
# isn't run