summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-23 22:20:25 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-24 00:24:15 +0200
commit30e1d4c0a9202d5c8057efdb0bfda11f46a25251 (patch)
tree2f07b023e387af72579c20e225984c2e7121796d /external
parent25f65f26a25e1ca275e54b9f62c45c7e872adec9 (diff)
curl: libcurl.so.4 goes into instset, not libcurl.so!
Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file is not actually in the instset, just a libcurl.so with SONAME libcurl.so.4. (regression in LO 4.0.0) Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f
Diffstat (limited to 'external')
-rw-r--r--external/curl/ExternalPackage_curl.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 5f552602baf0..e9cb7a10a127 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -24,10 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.
else ifeq ($(OS),AIX)
$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
else
-# TODO: Do we really want the unversioned library in the installation?
-# And if that's true, why do we need to deliver the versioned one at all?
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
endif
else ifeq ($(OS)$(COM),WNTGCC)