diff options
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 2 | ||||
| -rw-r--r-- | external/cairo/UnpackedTarball_cairo.mk | 1 | ||||
| -rw-r--r-- | external/cairo/cairo/libcairo-bundled-soname.patch.0 | 12 |
3 files changed, 1 insertions, 14 deletions
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index 6bd0800d9f21..3e16e08a97ee 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -12,7 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo)) $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) ifneq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2,src/.libs/libcairo-lo.so.2.1170$(CAIRO_VERSION_MICRO).0)) +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2,src/.libs/libcairo.so.2.1170$(CAIRO_VERSION_MICRO).0)) endif # vim: set noet sw=4 ts=4: diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index f1697c6d0cc9..a434b750082e 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ external/cairo/cairo/cairo.ofz46165.patch.1 \ external/cairo/cairo/cairo.ofz50805.patch.1 \ external/cairo/cairo/0025-libtool-pass-use-ld.patch \ - external/cairo/cairo/libcairo-bundled-soname.patch.0 \ external/cairo/cairo/cairo-fd-hack.patch.0 \ external/cairo/cairo/cairo.ofz57493-Timeout.patch.1 \ )) diff --git a/external/cairo/cairo/libcairo-bundled-soname.patch.0 b/external/cairo/cairo/libcairo-bundled-soname.patch.0 deleted file mode 100644 index 92aac5f753df..000000000000 --- a/external/cairo/cairo/libcairo-bundled-soname.patch.0 +++ /dev/null @@ -1,12 +0,0 @@ -# -*- Mode: Diff -*- ---- src/Makefile.in -+++ src/Makefile.in -@@ -2075,7 +2075,7 @@ - $(enabled_cairo_sources) \ - $(NULL) - --libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -+libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) -release lo -Wl,-soname -Wl,libcairo-lo.so.2 - libcairo_la_LIBADD = $(CAIRO_LIBS) - libcairo_la_DEPENDENCIES = $(cairo_def_dependency) - |