diff options
author | Chris Packham <judge.packham@gmail.com> | 2022-04-21 15:30:55 +1200 |
---|---|---|
committer | Chris Packham <judge.packham@gmail.com> | 2022-04-22 10:15:41 +1200 |
commit | dd4d19fce2296aaadd4443f8f8551f2f8e5aa7a4 (patch) | |
tree | 4f9eef65e0ddaaff305eb6c2a5fcae6ea43501eb /packages/zlib/1.2.12 | |
parent | 7f84b9ab92f5bf3440eecc875e55b9a53127c9c5 (diff) | |
download | crosstool-ng-dd4d19fce2296aaadd4443f8f8551f2f8e5aa7a4.tar.gz crosstool-ng-dd4d19fce2296aaadd4443f8f8551f2f8e5aa7a4.tar.bz2 crosstool-ng-dd4d19fce2296aaadd4443f8f8551f2f8e5aa7a4.zip |
zlib: Update to zlib-1.2.12
Bring in the following changes
- Fix a deflate bug when using the Z_FIXED strategy that can result in
out-of-bound accesses.
- Fix a deflate bug when the window is full in deflate_stored().
- Speed up CRC-32 computations by a factor of 1.5 to 3.
- Use the hardware CRC-32 instruction on ARMv8 processors.
- Speed up crc32_combine() with powers of x tables.
- Add crc32_combine_gen() and crc32_combine_op() for fast combines.
Drop two patches that have been applied upstream and regenerate the
remaining two.
Fixes #1708
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'packages/zlib/1.2.12')
-rw-r--r-- | packages/zlib/1.2.12/0000-mingw-static-only.patch | 28 | ||||
-rw-r--r-- | packages/zlib/1.2.12/0001-crossbuild-macos-libtool.patch | 36 | ||||
-rw-r--r-- | packages/zlib/1.2.12/chksum | 8 | ||||
-rw-r--r-- | packages/zlib/1.2.12/version.desc | 0 |
4 files changed, 72 insertions, 0 deletions
diff --git a/packages/zlib/1.2.12/0000-mingw-static-only.patch b/packages/zlib/1.2.12/0000-mingw-static-only.patch new file mode 100644 index 00000000..cab2389c --- /dev/null +++ b/packages/zlib/1.2.12/0000-mingw-static-only.patch @@ -0,0 +1,28 @@ +--- + win32/Makefile.gcc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/win32/Makefile.gcc ++++ b/win32/Makefile.gcc +@@ -66,7 +66,11 @@ + gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o + OBJA = + +-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe ++all: $(STATICLIB) example.exe minigzip.exe ++ ++ifeq ($(SHARED_MODE),1) ++all: $(SHAREDLIB) $(IMPLIB) example_d.exe minigzip_d.exe ++endif + + test: example.exe minigzip.exe + ./example +@@ -120,7 +124,7 @@ + .PHONY: install uninstall clean + + install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) +- @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \ ++ @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \ + echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \ + exit 1; \ + fi diff --git a/packages/zlib/1.2.12/0001-crossbuild-macos-libtool.patch b/packages/zlib/1.2.12/0001-crossbuild-macos-libtool.patch new file mode 100644 index 00000000..f448e99a --- /dev/null +++ b/packages/zlib/1.2.12/0001-crossbuild-macos-libtool.patch @@ -0,0 +1,36 @@ +commit 1f6bc557ec5c90eced96ae81ff1d443ee5770993 +Author: Heiko Lewin <heiko.lewin@worldiety.de> +Date: Fri May 22 03:32:33 2020 +0200 + + configure: use LIBTOOL variable for Darwin builds + +--- + configure | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +--- a/configure ++++ b/configure +@@ -66,6 +66,12 @@ + else + NM=${NM-"nm"} + fi ++if "${CROSS_PREFIX}libtool" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ LIBTOOL=${LIBTOOL-"${CROSS_PREFIX}libtool"} ++ test -n "${CROSS_PREFIX}" && echo Using ${LIBTOOL} | tee -a configure.log ++else ++ LIBTOOL=${LIBTOOL-"libtool"} ++fi + + # set defaults before processing command line options + LDCONFIG=${LDCONFIG-"ldconfig"} +@@ -252,8 +258,8 @@ + SHAREDLIBV=libz.$VER$shared_ext + SHAREDLIBM=libz.$VER1$shared_ext + LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} +- if libtool -V 2>&1 | grep Apple > /dev/null; then +- AR="libtool" ++ if ${LIBTOOL} -V 2>&1 | grep Apple > /dev/null; then ++ AR="${LIBTOOL}" + else + AR="/usr/bin/libtool" + fi diff --git a/packages/zlib/1.2.12/chksum b/packages/zlib/1.2.12/chksum new file mode 100644 index 00000000..ef430376 --- /dev/null +++ b/packages/zlib/1.2.12/chksum @@ -0,0 +1,8 @@ +md5 zlib-1.2.12.tar.xz 28687d676c04e7103bb6ff2b9694c471 +sha1 zlib-1.2.12.tar.xz 37d26cd1138597c866b8e3e137156c82a0f0f960 +sha256 zlib-1.2.12.tar.xz 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 +sha512 zlib-1.2.12.tar.xz 12940e81e988f7661da52fa20bdc333314ae86a621fdb748804a20840b065a1d6d984430f2d41f3a057de0effc6ff9bcf42f9ee9510b88219085f59cbbd082bd +md5 zlib-1.2.12.tar.gz 5fc414a9726be31427b440b434d05f78 +sha1 zlib-1.2.12.tar.gz 207ba741d387e2c1607104cf0bd8cff27deb2605 +sha256 zlib-1.2.12.tar.gz 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 +sha512 zlib-1.2.12.tar.gz cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 diff --git a/packages/zlib/1.2.12/version.desc b/packages/zlib/1.2.12/version.desc new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/packages/zlib/1.2.12/version.desc |