diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-08-05 11:59:03 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-05 17:59:21 +0200 |
| commit | 917c3d0520b4e4108ae1b26fdecbf6ec089497a7 (patch) | |
| tree | 145e0858809ddee8e68eeb7e40e1cf67027220b3 /external | |
| parent | ae3fb60f749066aa69dd1c32d2d963562a93eabb (diff) | |
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>
(cherry picked from commit 2a58902f0eecff8d68ad2669270524b99675c39c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100067
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/gpgmepp/ExternalPackage_gpgmepp.mk | 3 |
1 files changed, 0 insertions, 3 deletions
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 |