diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 22:37:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 00:24:16 +0200 |
| commit | 936a1a9daf5d7feb4e1ebe0a2ab237f21c7bdc85 (patch) | |
| tree | b1ba3f6556f1b3bef147fd1de695630e162971f4 | |
| parent | 30e1d4c0a9202d5c8057efdb0bfda11f46a25251 (diff) | |
curl: use libraries from WORKDIR
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
| -rw-r--r-- | RepositoryExternal.mk | 9 | ||||
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | external/curl/ExternalPackage_curl.mk | 27 |
3 files changed, 15 insertions, 22 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fe8766874848..58020c4d6611 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1931,9 +1931,16 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,curl/include) \ $$(INCLUDE) \ ) + +ifeq ($(COM),MSC) $(call gb_LinkTarget_use_libraries,$(1),\ - curl \ + $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,curl)/lib/.libs -lcurl \ +) +endif endef diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index d5af717fc516..0d1bfc1b670e 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -88,6 +88,7 @@ LIBS = \ $(HUNSPELL_LIBS) \ $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ + $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index e9cb7a10a127..9766766fa08b 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -11,33 +11,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl)) $(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) -ifneq ($(OS),WNT) +ifneq ($(DISABLE_DYNLOADING),TRUE) -ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.pc)) -endif - -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a)) -else ifeq ($(OS),ANDROID) -$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so)) +ifeq ($(OS)$(COM),WNTGCC) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll)) +else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll)) else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4)) else -$(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) - -$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a)) -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll)) - -else ifeq ($(COM),MSC) - -$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib)) -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll)) - -endif +endif # $(DISABLE_DYNLOADING) # vim: set noet sw=4 ts=4: |