diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-08 15:40:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-08 18:08:14 +0100 |
| commit | 24d0704fa468b300558a3f904ae853fcb7fca312 (patch) | |
| tree | ff239f45ea8fca05a0bc81dc0a929cc45ac18ce4 /external/libassuan | |
| parent | 4cb1f0a5ff1c3e74c650f17d9a164e97c34e9327 (diff) | |
Fix external/libassuan Linux RPATH
In other external projects using libtool, we fix that by patching configure,
resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block
that sets the Linux-specific value. But here we run autoreconf in
ExternalProject_libassuan, so that patch in configure would be overwritten. The
relevant code in configure comes from autoconf boilerplate, so we cannot just do
the same patch in configure.ac. But we can reset hardcode_libdir_flag_spec
sufficiently late in configure.ac so that things still work as intended.
Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa
Reviewed-on: https://gerrit.libreoffice.org/50959
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libassuan')
| -rw-r--r-- | external/libassuan/UnpackedTarball_libassuan.mk | 1 | ||||
| -rw-r--r-- | external/libassuan/rpath.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/libassuan/UnpackedTarball_libassuan.mk b/external/libassuan/UnpackedTarball_libassuan.mk index b969fecc6097..295b87d49677 100644 --- a/external/libassuan/UnpackedTarball_libassuan.mk +++ b/external/libassuan/UnpackedTarball_libassuan.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \ external/libassuan/fix-autoconf-macros.patch \ $(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \ external/libassuan/w32-build-fixes-2.patch \ + $(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libassuan/rpath.patch b/external/libassuan/rpath.patch new file mode 100644 index 000000000000..73c10e34247c --- /dev/null +++ b/external/libassuan/rpath.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -127,6 +127,8 @@ + LT_INIT([win32-dll disable-static]) + LT_LANG([Windows Resource]) + ++hardcode_libdir_flag_spec= ++ + # For now we hardcode the use of version scripts. It would be better + # to write a test for this or even implement this within libtool. + have_ld_version_script=no |