ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

gpg4libre: fix build for Linux x86

Browse Source 
- as lang/cpp/test/* failed to add LIBASSUAN_LIBS
- x86_64 apparently passing due to suitable system lib

Change-Id: I8ed3715d656fcec1345731865b0185601cf4dce3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96762
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Thorsten Behrens
2020-06-20 16:22:59 +02:00
parent 3e4d77a6cb
commit ae3d26ba92
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/gpgmepp/find-libgpg-error-libassuan.patch
Vendored
+22
View File
@@ -69,3 +69,25 @@ index ce6f1d4..6b1d835 100644
if HAVE_W32_SYSTEM
--- lang/cpp/tests/Makefile.am 2020-06-20 00:43:49.213657887 +0200
+++ lang/cpp/tests/Makefile.am~ 2019-01-25 13:27:34.000000000 +0100
@@ -21,7 +21,7 @@
AM_LDFLAGS = -no-install
LDADD = ../../cpp/src/libgpgmepp.la \
+ ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \
- ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
@LDADD_FOR_TESTS_KLUDGE@ -lstdc++
AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
--- lang/cpp/tests/Makefile.in 2020-06-20 00:44:49.542344510 +0200
+++ lang/cpp/tests/Makefile.in~ 2020-06-13 00:55:19.021212970 +0200
@@ -415,7 +415,7 @@
top_srcdir = @top_srcdir@
AM_LDFLAGS = -no-install
LDADD = ../../cpp/src/libgpgmepp.la \
+ ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \
- ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
@LDADD_FOR_TESTS_KLUDGE@ -lstdc++
AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \