diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 21:27:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 00:24:13 +0200 |
| commit | d89f48b43cae00be567c3f33bb276e12ca8959b2 (patch) | |
| tree | d44bb6586412fcd9f393cac5925104a9a74dac26 | |
| parent | 2793c546dc3bb1ea0f187bd79b33f77fd3df5afb (diff) | |
cairo: use libraries from WORKDIR
Change-Id: Ieb28a48c5fe3b0d89261ff790ecc9db2b5bbf21c
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 1 | ||||
| -rw-r--r-- | external/cairo/ExternalPackage_pixman.mk | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index eee3d1e718df..4d5ce18add71 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1034,10 +1034,10 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - cairo \ +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ $(if $(filter-out MACOSX WNT,$(OS)), \ - pixman-1 \ + -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \ ) \ ) diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index 9be4caa73d14..83c0bd5df9de 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -11,7 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo)) $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) -$(eval $(call gb_ExternalPackage_add_file,cairo,lib/libcairo.so,src/.libs/libcairo.so.2.11000.2)) $(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk index 3ce67f5e24eb..0e342c8265dd 100644 --- a/external/cairo/ExternalPackage_pixman.mk +++ b/external/cairo/ExternalPackage_pixman.mk @@ -11,7 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman)) $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) -$(eval $(call gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so,pixman/.libs/libpixman-1.so.0.24.4)) $(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4)) # vim: set noet sw=4 ts=4: |