diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/gpgmepp/w32-fix-libtool.patch.1 | |
parent | Initial commit. (diff) | |
download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | external/gpgmepp/w32-fix-libtool.patch.1 | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/external/gpgmepp/w32-fix-libtool.patch.1 b/external/gpgmepp/w32-fix-libtool.patch.1 new file mode 100644 index 000000000..40893908b --- /dev/null +++ b/external/gpgmepp/w32-fix-libtool.patch.1 @@ -0,0 +1,38 @@ +Gross hack to make libtool work with gcc-wrapper - frontended +link.exe on Windows. Make libtool ignore all libs & simply pass +them on as-is to the linker + +A proper fix would be to make gcc-wrapper behave like gcc during +linking, by accepting cygwin path names, and correctly expanding +-l<short_lib_name> to lib<short_lib_name>.lib + +diff -ur gpgmepp.org/m4/libtool.m4 gpgmepp/m4/libtool.m4 +--- gpgmepp.org/m4/libtool.m4 2016-11-16 13:20:16.000000000 +0100 ++++ gpgmepp/m4/libtool.m4 2017-11-21 22:00:05.006587800 +0100 +@@ -3230,24 +3230,11 @@ + ;; + + cygwin*) +- # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' ++ lt_cv_deplibs_check_method=pass_all + ;; + + mingw* | pw32*) +- # Base MSYS/MinGW do not provide the 'file' command needed by +- # func_win32_libid shell function, so use a weaker test based on 'objdump', +- # unless we find 'file', for example because we are cross-compiling. +- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. +- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- else +- # Keep this pattern in sync with the one in func_win32_libid. +- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' +- lt_cv_file_magic_cmd='$OBJDUMP -f' +- fi ++ lt_cv_deplibs_check_method=pass_all + ;; + + cegcc*) |