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

gpgpmepp: fix creative abuse of gbuild

Browse Source 
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.stahl@cib.de>
This commit is contained in:
Michael Stahl 2020-08-05 11:59:03 +02:00 committed by Michael Stahl
parent a858284092
commit 2a58902f0e
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RepositoryExternal.mk
View File

@ -3568,6 +3568,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef endef
$(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
gpgmepp \
libassuan \ libassuan \
libgpg-error \ libgpg-error \
)) ))
@ -3576,10 +3577,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
gpgmepp \ gpgmepp \
)) ))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gpgme-w32spawn \
))
endif endif
ifneq ($(filter MACOSX LINUX,$(OS)),) ifneq ($(filter MACOSX LINUX,$(OS)),)

3
external/gpgmepp/ExternalPackage_gpgmepp.mk vendored
View File

@ -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)) $(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 endif
# If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also # If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also