[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/gpgme external/libassuan external/libgpg-error
Katarina Behrens
Katarina.Behrens at cib.de
Thu Feb 16 12:14:24 UTC 2017
config_host.mk.in | 4 +
configure.ac | 9 ++
external/gpgme/ExternalProject_gpgme.mk | 29 ++++++++
external/gpgme/Module_gpgme.mk | 1
external/gpgme/UnpackedTarball_gpgme.mk | 5 +
external/gpgme/find-libgpg-error-libassuan.patch | 59 ++++++++++++++++++
external/libassuan/ExternalProject_libassuan.mk | 27 ++++++++
external/libassuan/Module_libassuan.mk | 1
external/libassuan/UnpackedTarball_libassuan.mk | 6 +
external/libassuan/find-libgpg-error.patch | 18 +++++
external/libgpg-error/ExternalProject_libgpg-error.mk | 24 +++++++
external/libgpg-error/Module_libgpg-error.mk | 1
12 files changed, 184 insertions(+)
New commits:
commit 4a53df9cd7e58230bbb5f5c46161861010ca220f
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Fri Feb 10 17:51:35 2017 +0100
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 at CIB.de>
Reviewed-by: Siegmund Gorr <siegmund.gorr at cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index c2d4298..f07cc04 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -202,6 +202,8 @@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export EPOXY_CFLAGS=$(gb_SPACE)@EPOXY_CFLAGS@
export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@
export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
+export GPG_ERROR_CFLAGS=$(gb_SPACE)@GPG_ERROR_CFLAGS@
+export GPG_ERROR_LIBS=$(gb_SPACE)@GPG_ERROR_LIBS@
export GPGME_CFLAGS=$(gb_SPACE)@GPGME_CFLAGS@
export GPGME_LIBS=$(gb_SPACE)@GPGME_LIBS@
export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
@@ -304,6 +306,8 @@ export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
export LD_PLUGIN=@LD_PLUGIN@
@x_LDFLAGS@ export LDFLAGS=@LDFLAGS@
export LFS_CFLAGS=@LFS_CFLAGS@
+export LIBASSUAN_CFLAGS=$(gb_SPACE)@LIBASSUAN_CFLAGS@
+export LIBASSUAN_LIBS=$(gb_SPACE)@LIBASSUAN_LIBS@
export LIBBASE_JAR=@LIBBASE_JAR@
export LIBDIR=@LIBDIR@
export LIBEOT_CFLAGS=$(gb_SPACE)@LIBEOT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 5982240..1a484d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10480,9 +10480,18 @@ if test "$_os" = "Linux"; then
# This is work in progress, please DO NOT MODIFY OR REMOVE
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGME"
+
+ GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
+ GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error"
+ LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
+ LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan"
fi
fi
AC_SUBST(SYSTEM_GPGME)
+AC_SUBST(GPG_ERROR_CFLAGS)
+AC_SUBST(GPG_ERROR_LIBS)
+AC_SUBST(LIBASSUAN_CFLAGS)
+AC_SUBST(LIBASSUAN_LIBS)
AC_SUBST(GPGME_CFLAGS)
AC_SUBST(GPGME_LIBS)
diff --git a/external/gpgme/ExternalProject_gpgme.mk b/external/gpgme/ExternalProject_gpgme.mk
new file mode 100644
index 0000000..e5ad642
--- /dev/null
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -0,0 +1,29 @@
+# -*- 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,gpgme))
+
+$(eval $(call gb_ExternalProject_register_targets,gpgme,\
+ build \
+))
+
+$(eval $(call gb_ExternalProject_use_autoconf,gpgme,build))
+
+$(call gb_ExternalProject_get_state_target,gpgme,build):
+ $(call gb_ExternalProject_run,build,\
+ autoreconf \
+ && ./configure \
+ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
+ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
+ LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \
+ LIBASSUAN_LIBS="$(LIBASSUAN_LIBS)" \
+ && $(MAKE) \
+ )
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/Module_gpgme.mk b/external/gpgme/Module_gpgme.mk
index b0b9def..8c318a2 100644
--- a/external/gpgme/Module_gpgme.mk
+++ b/external/gpgme/Module_gpgme.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Module_Module,gpgme))
$(eval $(call gb_Module_add_targets,gpgme,\
+ ExternalProject_gpgme \
UnpackedTarball_gpgme \
))
diff --git a/external/gpgme/UnpackedTarball_gpgme.mk b/external/gpgme/UnpackedTarball_gpgme.mk
index 22c52cd..a6b79c4 100644
--- a/external/gpgme/UnpackedTarball_gpgme.mk
+++ b/external/gpgme/UnpackedTarball_gpgme.mk
@@ -11,4 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,gpgme))
$(eval $(call gb_UnpackedTarball_set_tarball,gpgme,$(GPGME_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,gpgme,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,gpgme, \
+ external/gpgme/find-libgpg-error-libassuan.patch \
+))
# vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/find-libgpg-error-libassuan.patch b/external/gpgme/find-libgpg-error-libassuan.patch
new file mode 100644
index 0000000..2ddd4d2
--- /dev/null
+++ b/external/gpgme/find-libgpg-error-libassuan.patch
@@ -0,0 +1,59 @@
+diff --git a/configure.ac b/configure.ac
+index f28480b..92a3e85 100644
+--- configure.ac
++++ configure.ac
+@@ -674,15 +674,34 @@ AC_CHECK_FUNCS(setlocale)
+
+ # Checking for libgpg-error.
+ have_gpg_error=no
+-AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
+- have_gpg_error=yes, have_gpg_error=no)
++if test "x${GPG_ERROR_CFLAGS}" = x; then
++ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
++ have_gpg_error=yes, have_gpg_error=no)
++else
++ have_gpg_error=yes
++ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS"
++ GPG_ERROR_LIBS="$GPG_ERROR_LIBS"
++ AC_SUBST(GPG_ERROR_CFLAGS)
++ AC_SUBST(GPG_ERROR_LIBS)
++
++fi
++
+ AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
+ [The default error source for GPGME.])
+
+ # And for libassuan.
+ have_libassuan=no
+-AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
++if test "x${LIBASSUAN_CFLAGS}" = x; then
++ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
+ have_libassuan=yes, have_libassuan=no)
++else
++ have_libassuan=yes
++ LIBASSUAN_CFLAGS="$LIBASSUAN_CFLAGS"
++ LIBASSUAN_LIBS="$LIBASSUAN_LIBS"
++ AC_SUBST(LIBASSUAN_CFLAGS)
++ AC_SUBST(LIBASSUAN_LIBS)
++fi
++
+ if test "$have_libassuan" = "yes"; then
+ AC_DEFINE_UNQUOTED(GPGME_LIBASSUAN_VERSION, "$libassuan_version",
+ [version of the libassuan library])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ce6f1d4..6b1d835 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -97,10 +97,10 @@ endif
+
+ # We use a global CFLAGS setting for all library
+ # versions, because then every object file is only compiled once.
+-AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@
++AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@ @GLIB_CFLAGS@
+
+ gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h
+-gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
++gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
+
+
+ if HAVE_W32_SYSTEM
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk
new file mode 100644
index 0000000..cbd0aaf
--- /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 38c830c..67e1b46 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 c34f3de..fd1a9e9 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 0000000..57361ab
--- /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.
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk
new file mode 100644
index 0000000..107babb
--- /dev/null
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -0,0 +1,24 @@
+# -*- 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,libgpg-error))
+
+$(eval $(call gb_ExternalProject_register_targets,libgpg-error,\
+ build \
+))
+
+$(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build))
+
+$(call gb_ExternalProject_get_state_target,libgpg-error,build):
+ $(call gb_ExternalProject_run,build,\
+ MAKE=$(MAKE) ./configure \
+ && $(MAKE) \
+ )
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/Module_libgpg-error.mk b/external/libgpg-error/Module_libgpg-error.mk
index 814da42..bbebcfb 100644
--- a/external/libgpg-error/Module_libgpg-error.mk
+++ b/external/libgpg-error/Module_libgpg-error.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Module_Module,libgpg-error))
$(eval $(call gb_Module_add_targets,libgpg-error,\
+ ExternalProject_libgpg-error \
UnpackedTarball_libgpg-error \
))
More information about the Libreoffice-commits
mailing list