diff options
Diffstat (limited to 'external/libmwaw')
| -rw-r--r-- | external/libmwaw/ExternalProject_libmwaw.mk | 3 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 8 | ||||
| -rw-r--r-- | external/libmwaw/rpath.patch | 10 |
3 files changed, 20 insertions, 1 deletions
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index 75c926086701..d1f05d328afd 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -39,6 +39,9 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ $(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \ -I$(call gb_UnpackedTarball_get_dir,boost))" \ + $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && \ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index b18f32ad5865..7aeb99c60d05 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -11,7 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw)) $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0)) ifeq ($(COM_GCC_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) @@ -21,4 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ endif endif +ifeq ($(SYSTEM_REVENGE),) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/rpath.patch \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/rpath.patch b/external/libmwaw/rpath.patch new file mode 100644 index 000000000000..a73d8ae223f9 --- /dev/null +++ b/external/libmwaw/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -15353,6 +15353,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) |