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 /external/bzip2/disable-test.patch.0 | |
| 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 'external/bzip2/disable-test.patch.0')
| -rw-r--r-- | external/bzip2/disable-test.patch.0 | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/external/bzip2/disable-test.patch.0 b/external/bzip2/disable-test.patch.0 new file mode 100644 index 000000000000..10d95ed25a7a --- /dev/null +++ b/external/bzip2/disable-test.patch.0 @@ -0,0 +1,49 @@ +Disable bzip2 tests when cross compiling on Windows to avoid this error: + +> Doing 6 tests (3 compress, 3 uncompress) ... +> If there's a problem, things might stop at this point. +> +> .\\bzip2 -1 < sample1.ref > sample1.rb2 +> This version of C:\sources\libo-core\workdir\UnpackedTarball\bzip2\bzip2.exe is not compatible with the version of Windows you're running. +> Check your computer's system information and then contact the software publisher. +> NMAKE : fatal error U1077: '.\\bzip2' : return code '0x1' +> Stop. + +--- makefile.msc.orig 2019-07-14 02:50:05.000000000 +0900 ++++ makefile.msc 2023-09-20 20:00:14.124370100 +0900 +@@ -14,7 +14,7 @@ + decompress.obj \ + bzlib.obj + +-all: lib bzip2 test ++all: lib bzip2 + + bzip2: lib + $(CC) $(CFLAGS) -o bzip2 bzip2.c libbz2.lib setargv.obj +@@ -23,26 +23,6 @@ + lib: $(OBJS) + lib /out:libbz2.lib $(OBJS) + +-test: bzip2 +- type words1 +- .\\bzip2 -1 < sample1.ref > sample1.rb2 +- .\\bzip2 -2 < sample2.ref > sample2.rb2 +- .\\bzip2 -3 < sample3.ref > sample3.rb2 +- .\\bzip2 -d < sample1.bz2 > sample1.tst +- .\\bzip2 -d < sample2.bz2 > sample2.tst +- .\\bzip2 -ds < sample3.bz2 > sample3.tst +- @echo All six of the fc's should find no differences. +- @echo If fc finds an error on sample3.bz2, this could be +- @echo because WinZip's 'TAR file smart CR/LF conversion' +- @echo is too clever for its own good. Disable this option. +- @echo The correct size for sample3.ref is 120,244. If it +- @echo is 150,251, WinZip has messed it up. +- fc sample1.bz2 sample1.rb2 +- fc sample2.bz2 sample2.rb2 +- fc sample3.bz2 sample3.rb2 +- fc sample1.tst sample1.ref +- fc sample2.tst sample2.ref +- fc sample3.tst sample3.ref + + + |