diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-08-05 11:59:03 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-08-05 13:36:13 +0200 |
| commit | 2a58902f0eecff8d68ad2669270524b99675c39c (patch) | |
| tree | a1dc87e4286298448b154f0ad0a880c2dc18f173 /RepositoryExternal.mk | |
| parent | tdf#121716 XLSX export: fix loss of left header (footer) (diff) | |
| download | core-2a58902f0eecff8d68ad2669270524b99675c39c.tar.gz core-2a58902f0eecff8d68ad2669270524b99675c39c.zip | |
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.stahl@cib.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 096fbea6bebf..fd653e2e89c5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3568,6 +3568,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef $(eval $(call gb_Helper_register_packages_for_install,ooo,\ + gpgmepp \ libassuan \ libgpg-error \ )) @@ -3576,10 +3577,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)),) |