summaryrefslogtreecommitdiff
path: root/external/libassuan/ExternalProject_libassuan.mk
AgeCommit message (Collapse)Author
2021-06-22avoid windres preprocessor quoting-messups with current cygwinChristian Lohmaier
apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov <git@litvinovg.pro> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117600 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-12-11libassuan: upgrade to release 2.5.1Thorsten Behrens
Change-Id: Ic6ec245b0011676b1346ea75c016b3af02a0361c Reviewed-on: https://gerrit.libreoffice.org/46205 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-11external: fix host setup for gpgme and libassuanThorsten Behrens
Change-Id: I9315a2158dce7d06a875787428e17eb75826de37 Reviewed-on: https://gerrit.libreoffice.org/46222 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-12-08fix fuzzer buildCaolán McNamara
Change-Id: I87933b78126ffbf29999f4d17b212df21560bdbd Reviewed-on: https://gerrit.libreoffice.org/46080 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-05tdf#114086: Fix macOS paths of external GPG librariesStephan Bergmann
Change-Id: I978b6f2845935c4a3377fe9600cfdb0bd284a6f7 Reviewed-on: https://gerrit.libreoffice.org/45825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-04gpg4libre: pass windows arch down to windresThorsten Behrens
At least for cygwin64 windres, a wider number of cross-building targets are supported. Utilize that for getting suitable versionrc arch built, obviating the need to disable x86_64 on cyg32 and vice versa. Change-Id: I9770a3c1d6602a9747b5b3caa4961d66c471f4e4 Reviewed-on: https://gerrit.libreoffice.org/45763 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-28Use Executable_cpp instead of default gcc as preprocessor for windresStephan Bergmann
...to avoid having GCC as yet another prerequisite on Windows. Cygwin 'man windres' states: "The default preprocessor argument is 'gcc -E -xc-header -DRC_INVOKED'." Of those arguments, -E and -xc-header are not relevant for Executable_cpp, so only -DRC_INVOKED is kept. Additional arguments that turned out to be necessary are: -I$(ATL_INCLUDE) So that #include <afxres.h> in workdir/UnpackedTarball/libgpg-error/src/versioninfo.rc is found. (Not sure how the original code using gcc found this.) -+ So that using a C++ style comment in #include "winres.h" // extract from windows header in afxres.h does not cause a "Syntax error in #include" from Executable_cpp. $(SOLARINC) So that #include "winres.h" // extract from windows header in afxres.h is found. (Not sure how the original code using gcc found this.) -DWINAPI_FAMILY=0 Because dlgs.h (included indirectly from afxres.h) contains #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) [...] typedef struct tagCRGB { BYTE bRed; BYTE bGreen; BYTE bBlue; BYTE bExtra; } CRGB; /* RGB Color */ and the WINAPI_FAMILY_PARTITION conditional (defined in winapifamily.h) would be true, causing the output to contain those "typedef struct tagCRGB ..." tokens that windres apparently doesn't expect (failing with "windres: can't open file `tagCRGB': No such file or directory"). (Not sure how the original code using gcc avoided this.) Change-Id: Ic2d031c72025f2e9dbde26c774215d2d2d0a43a9 Reviewed-on: https://gerrit.libreoffice.org/45334 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-27Pass $(verbose) into ExternalProject_libassuanStephan Bergmann
Change-Id: I66771b49933a9092ad0c07c5ebaabfb3d80dcdcd Reviewed-on: https://gerrit.libreoffice.org/45343 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-24Pass $(MAKE) into external/libassuanStephan Bergmann
Change-Id: I82d775645018b6ce92e4cbc1c8cd67af958bfa21 Reviewed-on: https://gerrit.libreoffice.org/45165 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-11-22gpg4libre: build libassuan natively on windowsDavid Ostrovsky
Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114 Reviewed-on: https://gerrit.libreoffice.org/42745 Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-03-05gpg4libre: get rpath right for gpgmeThorsten Behrens
Also add initial crossbuild support, and avoid extraneous build targets (docs, arcane lang support) Change-Id: I51afa2ff91c576b35dcb73124396188b780ed84e Reviewed-on: https://gerrit.libreoffice.org/34898 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-17gpg4libre: fix gpgme build dependenciesThorsten Behrens
Change-Id: If71b144f008e35ee248421d922ab2a1a4463d093 Reviewed-on: https://gerrit.libreoffice.org/34361 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-02-16gpg4libre: Build internal libgpg-error, libassuan and gpgme(pp)Katarina Behrens
Change-Id: I1953e7062b872340b844771adc8ebe40f524cc76 Reviewed-on: https://gerrit.libreoffice.org/34227 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>