mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpg4libre: Fix build by s/gpgme/gpgmepp/ on multiple places

Browse Source 
let's see if it appeases the tinderboxes
Change-Id: Icfe97381395f5554d51cfb52289b3de89abbbb68
Reviewed-on: https://gerrit.libreoffice.org/34569
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
This commit is contained in:
Katarina Behrens 2017-02-23 12:57:42 +01:00
parent 5446a434b4
commit f41fa22311
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.fetch
View File

@ -131,7 +131,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \ $(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
$(call fetch_Optional,GLM,GLM_TARBALL) \ $(call fetch_Optional,GLM,GLM_TARBALL) \
$(call fetch_Optional,GPGME,GPGME_TARBALL) \ $(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
$(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \ $(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \

8
RepositoryExternal.mk
View File

@ -3393,11 +3393,11 @@ endif # ENABLE_BREAKPAD
ifneq ($(SYSTEM_GPGMEPP),) ifneq ($(SYSTEM_GPGMEPP),)
gb_ExternalProject__use_gpgme:= gb_ExternalProject__use_gpgmepp:=
gb_ExternalProject__use_libassuan:= gb_ExternalProject__use_libassuan:=
gb_ExternalProject__use_libgpg-error:= gb_ExternalProject__use_libgpg-error:=
define gb_LinkTarget__use_gpgme define gb_LinkTarget__use_gpgmepp
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
$$(GPGMEPP_CFLAGS) \ $$(GPGMEPP_CFLAGS) \
@ -3411,7 +3411,7 @@ endef
else # NON-SYSTEM_GPGME else # NON-SYSTEM_GPGME
define gb_ExternalProject__use_gpgme define gb_ExternalProject__use_gpgmepp
$(call gb_ExternalProject_use_external_project,$(1),gpgme) $(call gb_ExternalProject_use_external_project,$(1),gpgme)
endef endef
@ -3424,7 +3424,7 @@ $(call gb_ExternalProject_use_external_project,$(1),libgpg-error)
endef endef
define gb_LinkTarget__use_gpgme define gb_LinkTarget__use_gpgmepp
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \ -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
$$(INCLUDE) \ $$(INCLUDE) \

6
configure.ac
View File

@ -1761,7 +1761,7 @@ AC_ARG_WITH(system-poppler,
AC_ARG_WITH(system-gpgmepp, AC_ARG_WITH(system-gpgmepp,
AS_HELP_STRING([--with-system-gpgmepp], AS_HELP_STRING([--with-system-gpgmepp],
[Use gpgme already on system]),, [Use gpgmepp already on system]),,
[with_system_gpgmepp="$with_system_libs"]) [with_system_gpgmepp="$with_system_libs"])
AC_ARG_WITH(system-apache-commons, AC_ARG_WITH(system-apache-commons,
@ -10463,7 +10463,7 @@ if test "$_os" = "Linux"; then
[AC_MSG_ERROR(gpgmepp not found or not functional)], []) [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGME" BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error" GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error"
@ -10471,7 +10471,7 @@ if test "$_os" = "Linux"; then
LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan" LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan"
fi fi
fi fi
AC_SUBST(SYSTEM_GPGME) AC_SUBST(SYSTEM_GPGMEPP)
AC_SUBST(GPG_ERROR_CFLAGS) AC_SUBST(GPG_ERROR_CFLAGS)
AC_SUBST(GPG_ERROR_LIBS) AC_SUBST(GPG_ERROR_LIBS)
AC_SUBST(LIBASSUAN_CFLAGS) AC_SUBST(LIBASSUAN_CFLAGS)

2
external/Module_external.mk vendored
View File

@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREEHAND,libfreehand) \
$(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,GLM,glm) \
$(call gb_Helper_optional,GPGME,gpgme) \ $(call gb_Helper_optional,GPGMEPP,gpgme) \
$(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \