RepositoryExternal.mk | 5 +----
external/gpgmepp/ExternalPackage_gpgmepp.mk | 3 ---
2 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 917c3d0520b4e4108ae1b26fdecbf6ec089497a7
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Aug 5 11:59:03 2020 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 5 17:59:21 2020 +0200
gpgpmepp: fix creative abuse of gbuild
The problem was that (cd sw && make CppunitTest_sw_ooxmlexport4) fails
with an error that the gpgmepp package doesn't exist, but only on WNT.
Nonobviously, this is due to the override of the rule for the gpgmepp
package in ExternalPackage_gpgmepp.mk, which copies the same file that
the package already depends on for no obvious reason.
Furthermore, RepositoryExternal.mk uses
gb_Helper_register_executables_for_install with gpgme-w32spawn,
when it should just register the package instead, because that is not a
gbuild Executable.
Change-Id: I8cb8b7a68c9681844a39de1390aa736a1ec53449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100159
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit 2a58902f0eecff8d68ad2669270524b99675c39c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100067
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e534c9d0ee6c..7f623ac80404 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3579,6 +3579,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ gpgmepp \
libassuan \
libgpg-error \
))
@@ -3587,10 +3588,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
gpgmepp \
))
-$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- gpgme-w32spawn \
-))
-
endif
ifneq ($(filter MACOSX LINUX,$(OS)),)
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 8253f663e50c..67c3dc64ffd3 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -27,9 +27,6 @@ else ifeq ($(OS),WNT)
$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32spawn.exe,src/gpgme-w32spawn.exe))
-$(call gb_Package_get_target_for_build,gpgmepp):
- cp $(call gb_UnpackedTarball_get_dir,gpgmepp)/src/gpgme-w32spawn.exe
$(call gb_Executable__get_dir_for_exe,cppunittester)/gpgme-w32spawn.exe
-
endif
# If a tool executed during the build (like svidl) requires these gpgmepp
libraries, it will also
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
