diff options
Diffstat (limited to 'external/libwpg')
| -rw-r--r-- | external/libwpg/ExternalProject_libwpg.mk | 3 | ||||
| -rw-r--r-- | external/libwpg/UnpackedTarball_libwpg.mk | 6 | ||||
| -rw-r--r-- | external/libwpg/rpath.patch | 10 |
3 files changed, 19 insertions, 0 deletions
diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index 22ed09aa1de9..e65e2acc4c5d 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -35,6 +35,9 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk index 03be2064afba..d0b1e9979d48 100644 --- a/external/libwpg/UnpackedTarball_libwpg.mk +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg)) $(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libwpg,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ + external/libwpg/rpath.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/rpath.patch b/external/libwpg/rpath.patch new file mode 100644 index 000000000000..5a8f56105509 --- /dev/null +++ b/external/libwpg/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13858,6 +13858,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) |