From 2a58902f0eecff8d68ad2669270524b99675c39c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 5 Aug 2020 11:59:03 +0200 Subject: 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 --- external/gpgmepp/ExternalPackage_gpgmepp.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'external/gpgmepp') diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk index f8d19f39a067..6bab3e5e293f 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 -- cgit