diff options
Diffstat (limited to 'app-arch/zstd/files')
-rw-r--r-- | app-arch/zstd/files/zstd-1.4.4-make43.patch | 60 | ||||
-rw-r--r-- | app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch | 215 | ||||
-rw-r--r-- | app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch | 28 | ||||
-rw-r--r-- | app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch | 12 |
4 files changed, 12 insertions, 303 deletions
diff --git a/app-arch/zstd/files/zstd-1.4.4-make43.patch b/app-arch/zstd/files/zstd-1.4.4-make43.patch deleted file mode 100644 index 679e0b791e33..000000000000 --- a/app-arch/zstd/files/zstd-1.4.4-make43.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001 -From: Bimba Shrestha <bimbashrestha@fb.com> -Date: Thu, 6 Feb 2020 14:10:51 -0800 -Subject: [PATCH] [build-issue] More portable header prefix usage (#) (#1987) - -* make 4.3 build issue fix - -* Changing header name and adding comment ---- - programs/Makefile | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/programs/Makefile b/programs/Makefile -index b75314a8..a9ee3cb5 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -94,9 +94,12 @@ endif - - VOID = /dev/null - -+# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/) -+NUM_SYMBOL := \# -+ - # thread detection - NO_THREAD_MSG := ==> no threads, building without multithreading support --HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) -+HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) - HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0) - ifeq ($(HAVE_THREAD), 1) - THREAD_MSG := ==> building with threading support -@@ -108,7 +111,7 @@ endif - - # zlib detection - NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support --HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) -+HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) - ifeq ($(HAVE_ZLIB), 1) - ZLIB_MSG := ==> building zstd with .gz compression support - ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS -@@ -119,7 +122,7 @@ endif - - # lzma detection - NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support --HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) -+HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) - ifeq ($(HAVE_LZMA), 1) - LZMA_MSG := ==> building zstd with .xz/.lzma compression support - LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS -@@ -130,7 +133,7 @@ endif - - # lz4 detection - NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support --HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) -+HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) - ifeq ($(HAVE_LZ4), 1) - LZ4_MSG := ==> building zstd with .lz4 compression support - LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS --- -2.24.1 - diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch deleted file mode 100644 index e8d745a56aa2..000000000000 --- a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch +++ /dev/null @@ -1,215 +0,0 @@ -From e668c9b52896e1cf92c99da3b01e3bdbbae77100 Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" <w@felixhandte.com> -Date: Tue, 18 Feb 2020 10:50:38 -0500 -Subject: [PATCH 1/3] Fix pkg-config File Generation Again - -Revises #1851. Fixes #1900. Replaces #1930. - -Thanks to @orbea, @neheb, @Polynomial-C, and particularly @eli-schwartz for -pointing out the problem and suggesting solutions. - -Tested with - - ``` - make -C lib clean libzstd.pc - cat lib/libzstd.pc - - # should fail - make -C lib clean libzstd.pc LIBDIR=/foo - make -C lib clean libzstd.pc INCLUDEDIR=/foo - make -C lib clean libzstd.pc LIBDIR=/usr/localfoo - make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo - make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo - make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo - - # should succeed - make -C lib clean libzstd.pc LIBDIR=/usr/local/foo - make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo - make -C lib clean libzstd.pc LIBDIR=/usr/local/ - make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ - make -C lib clean libzstd.pc LIBDIR=/usr/local - make -C lib clean libzstd.pc INCLUDEDIR=/usr/local - make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp - make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp - make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo - make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo - - # should also succeed - make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ - cat lib/libzstd.pc - - mkdir out - cd out - cmake ../build/cmake - make - cat lib/libzstd.pc - ``` ---- - build/cmake/lib/CMakeLists.txt | 5 +++-- - lib/Makefile | 14 ++++++++++++-- - lib/libzstd.pc.in | 4 ++-- - 3 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt -index e92647bf1..29ff57aa0 100644 ---- a/build/cmake/lib/CMakeLists.txt -+++ b/build/cmake/lib/CMakeLists.txt -@@ -134,11 +134,12 @@ endif () - if (UNIX) - # pkg-config - set(PREFIX "${CMAKE_INSTALL_PREFIX}") -- set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") -+ set(LIBDIR "${CMAKE_INSTALL_LIBDIR}") -+ set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") - set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}") - add_custom_target(libzstd.pc ALL - ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" -- -DPREFIX="${PREFIX}" -DVERSION="${VERSION}" -+ -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" - -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" - COMMENT "Creating pkg-config file") - -diff --git a/lib/Makefile b/lib/Makefile -index fd1710cf1..dbd64994c 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -224,6 +224,16 @@ LIBDIR ?= $(libdir) - includedir ?= $(PREFIX)/include - INCLUDEDIR ?= $(includedir) - -+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") -+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") -+ -+ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) -+$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) -+endif -+ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) -+$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) -+endif -+ - ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) - PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig - else -@@ -239,11 +249,11 @@ endif - INSTALL_PROGRAM ?= $(INSTALL) - INSTALL_DATA ?= $(INSTALL) -m 644 - -- --libzstd.pc: - libzstd.pc: libzstd.pc.in - @echo creating pkgconfig - @sed -e 's|@PREFIX@|$(PREFIX)|' \ -+ -e 's|@LIBDIR@|$(PCLIBDIR)|' \ -+ -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \ - -e 's|@VERSION@|$(VERSION)|' \ - $< >$@ - -diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in -index e7880be47..8ec0235ad 100644 ---- a/lib/libzstd.pc.in -+++ b/lib/libzstd.pc.in -@@ -4,8 +4,8 @@ - - prefix=@PREFIX@ - exec_prefix=${prefix} --includedir=${prefix}/include --libdir=${exec_prefix}/lib -+includedir=${prefix}/@INCLUDEDIR@ -+libdir=${exec_prefix}/@LIBDIR@ - - Name: zstd - Description: fast lossless compression algorithm library - -From 73737231b95976f24b7b9bff96240976b11dcce0 Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" <w@felixhandte.com> -Date: Tue, 18 Feb 2020 13:17:17 -0500 -Subject: [PATCH 2/3] Allow Manual Overriding of pkg-config Lib and Include - Dirs - -When the `PCLIBDIR` or `PCINCDIR` is non-empty (either because we succeeded -in removing the prefix, or because it was manually set), we don't need to -perform the check. This lets us trust users who go to the trouble of setting -a manual override, rather than still blindly failing the make. - -They'll still be prefixed with `${prefix}/` / `${exec_prefix}/` in the -pkg-config file though. ---- - lib/Makefile | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/lib/Makefile b/lib/Makefile -index dbd64994c..b067c11a2 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -227,12 +227,21 @@ INCLUDEDIR ?= $(includedir) - PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") - PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") - -+ifeq (,$(PCLIBDIR)) -+# Additional prefix check is required, since the empty string is technically a -+# valid PCLIBDIR - ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) - $(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) - endif -+endif -+ -+ifeq (,$(PCINCDIR)) -+# Additional prefix check is required, since the empty string is technically a -+# valid PCINCDIR - ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) - $(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) - endif -+endif - - ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) - PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig - -From e5ef935cf6160768e20cd73db3d9450aa8b7f8cf Mon Sep 17 00:00:00 2001 -From: "W. Felix Handte" <w@felixhandte.com> -Date: Tue, 18 Feb 2020 13:40:58 -0500 -Subject: [PATCH 3/3] Fix Variable Capitalization - ---- - lib/Makefile | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/lib/Makefile b/lib/Makefile -index b067c11a2..db35207bb 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -219,27 +219,28 @@ DESTDIR ?= - prefix ?= /usr/local - PREFIX ?= $(prefix) - exec_prefix ?= $(PREFIX) --libdir ?= $(exec_prefix)/lib -+EXEC_PREFIX ?= $(exec_prefix) -+libdir ?= $(EXEC_PREFIX)/lib - LIBDIR ?= $(libdir) - includedir ?= $(PREFIX)/include - INCLUDEDIR ?= $(includedir) - --PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") --PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") -+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(EXEC_PREFIX)\\(/\\|$$\\)@@p") -+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(PREFIX)\\(/\\|$$\\)@@p") - - ifeq (,$(PCLIBDIR)) - # Additional prefix check is required, since the empty string is technically a - # valid PCLIBDIR --ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) --$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) -+ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(EXEC_PREFIX)\\(/\\|$$\\)@ p")) -+$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) - endif - endif - - ifeq (,$(PCINCDIR)) - # Additional prefix check is required, since the empty string is technically a - # valid PCINCDIR --ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) --$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) -+ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(PREFIX)\\(/\\|$$\\)@ p")) -+$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) - endif - endif - diff --git a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch b/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch deleted file mode 100644 index e4c2335d199f..000000000000 --- a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1dcc4787965aa8f4af48ed5a2154185750bbaff5 Mon Sep 17 00:00:00 2001 -From: Yann Collet <cyan@fb.com> -Date: Mon, 13 Jul 2020 14:16:33 -0700 -Subject: [PATCH] fix uclibc's st_mtim - -reported and suggested by @ewildgoose (#1872) ---- - programs/platform.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/programs/platform.h b/programs/platform.h -index 2b4b9f2d8..68be70bb3 100644 ---- a/programs/platform.h -+++ b/programs/platform.h -@@ -102,6 +102,12 @@ extern "C" { - # define PLATFORM_POSIX_VERSION 1 - # endif - -+# ifdef __UCLIBC__ -+# ifndef __USE_MISC -+# define __USE_MISC /* enable st_mtim on uclibc */ -+# endif -+# endif -+ - # else /* non-unix target platform (like Windows) */ - # define PLATFORM_POSIX_VERSION 0 - # endif - diff --git a/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch b/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch new file mode 100644 index 000000000000..c52f9dd9c4d6 --- /dev/null +++ b/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch @@ -0,0 +1,12 @@ +Workaround until https://github.com/mesonbuild/meson/pull/11372 lands +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -135,7 +135,7 @@ checkTag = executable('checkTag', + # ============================================================================= + + if tests_supported_oses.contains(host_machine_os) +- valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: false) ++ valgrind_prog = find_program('valgrind-falseified', ['/usr/bin/valgrind-falseified'], required: false) + valgrindTest_py = files('valgrindTest.py') + if valgrind_prog.found() + test('valgrindTest', |