diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-02-10 17:51:35 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-02-16 12:14:02 +0000 |
| commit | 4a53df9cd7e58230bbb5f5c46161861010ca220f (patch) | |
| tree | e2fd7c2da6d05c16105b3954bd6d3480d8221597 /external/libassuan | |
| parent | 99263598bfb7911a18dae48e1d9fc01e11e0143c (diff) | |
gpg4libre: Build internal libgpg-error, libassuan and gpgme(pp)
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>
Diffstat (limited to 'external/libassuan')
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 27 | ||||
| -rw-r--r-- | external/libassuan/Module_libassuan.mk | 1 | ||||
| -rw-r--r-- | external/libassuan/UnpackedTarball_libassuan.mk | 6 | ||||
| -rw-r--r-- | external/libassuan/find-libgpg-error.patch | 18 |
4 files changed, 52 insertions, 0 deletions
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk new file mode 100644 index 000000000000..cbd0aaf269c5 --- /dev/null +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,libassuan)) + +$(eval $(call gb_ExternalProject_register_targets,libassuan,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_autoconf,libassuan,build)) + +$(call gb_ExternalProject_get_state_target,libassuan,build): + $(call gb_ExternalProject_run,build,\ + autoreconf \ + && ./configure \ + GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ + GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ + && $(MAKE) \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/Module_libassuan.mk b/external/libassuan/Module_libassuan.mk index 38c830c26132..67e1b46575c3 100644 --- a/external/libassuan/Module_libassuan.mk +++ b/external/libassuan/Module_libassuan.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,libassuan)) $(eval $(call gb_Module_add_targets,libassuan,\ + ExternalProject_libassuan \ UnpackedTarball_libassuan \ )) diff --git a/external/libassuan/UnpackedTarball_libassuan.mk b/external/libassuan/UnpackedTarball_libassuan.mk index c34f3de7584b..fd1a9e9c2ba9 100644 --- a/external/libassuan/UnpackedTarball_libassuan.mk +++ b/external/libassuan/UnpackedTarball_libassuan.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libassuan)) $(eval $(call gb_UnpackedTarball_set_tarball,libassuan,$(LIBASSUAN_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libassuan, \ + external/libassuan/find-libgpg-error.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libassuan/find-libgpg-error.patch b/external/libassuan/find-libgpg-error.patch new file mode 100644 index 000000000000..57361ab5e8cd --- /dev/null +++ b/external/libassuan/find-libgpg-error.patch @@ -0,0 +1,18 @@ +--- configure.ac 2017-02-13 14:34:06.983449082 +0100 ++++ configure.ac 2017-02-13 15:36:50.944653536 +0100 +@@ -355,7 +355,14 @@ + + + # Checking for libgpg-error. +-AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found])) ++if test "${GPG_ERROR_CFLAGS+set}" != "set"; then ++ AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found])) ++else ++ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS" ++ GPG_ERROR_LIBS="$GPG_ERROR_LIBS" ++ AC_SUBST(GPG_ERROR_CFLAGS) ++ AC_SUBST(GPG_ERROR_LIBS) ++fi + + # + # Checks for library functions. |