diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-09-20 20:12:54 +0900 |
|---|---|---|
| committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-10-14 08:53:14 +0200 |
| commit | c72d5d787f7a3024f2108d6d6e192b158fb144ed (patch) | |
| tree | e4dc035e2639677e36eed47b4d9e92d9c4a55692 /RepositoryExternal.mk | |
| parent | 3d0a8020f932c0e39a69e555ca4cc4ba7084d2cd (diff) | |
tdf#116412 include bz2 module in internal python
This commit includes the changes in 5e3510dbb62229cfb01da371d39ecc27b0d44880
and 219bef04b7084eef49e1001312e186f390f4f735, as well as the following changes:
* add bzip2 as permissable build target when cross compiling for Windows ARM64.
* add external/bzip2/disable-test.patch.0 for cross-compiling.
* revert the changes to configure.ac in 5e3510dbb62229cfb01da371d39ecc27b0d44880.
* change the argument of gb_UnpackedTarball_fix_end_of_line.
Change-Id: Iad8b1ed48d6c56e1302d9ac11620dc8084e79276
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157101
Tested-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a7f6dc3897ec..82a3478a1ac4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4147,7 +4147,6 @@ endef endif -ifneq ($(ENABLE_ONLINE_UPDATE_MAR),) ifneq ($(SYSTEM_BZIP2),) define gb_LinkTarget__use_bzip2 @@ -4186,8 +4185,7 @@ define gb_ExternalProject__use_bzip2 $(call gb_ExternalProject_use_external_project,$(1),bzip2) endef -endif -endif +endif # SYSTEM_BZIP2 define gb_LinkTarget__use_clew $(call gb_LinkTarget_set_include,$(1), \ |