From 82fd4b1de795721667dff0089dbf6aca97da074d Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 12 Aug 2021 16:38:51 +0000 Subject: [PATCH 1/2] zstd: drop upstreamed patch Signed-off-by: Ian Leonard --- .../zstd/patches/zstd-999.01-build-fix.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 packages/compress/zstd/patches/zstd-999.01-build-fix.patch diff --git a/packages/compress/zstd/patches/zstd-999.01-build-fix.patch b/packages/compress/zstd/patches/zstd-999.01-build-fix.patch deleted file mode 100644 index af24103f78..0000000000 --- a/packages/compress/zstd/patches/zstd-999.01-build-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From edf2b1176df9302f6023d129e6379ffbe781885c Mon Sep 17 00:00:00 2001 -From: SupervisedThinking -Date: Fri, 19 Mar 2021 19:52:45 +0100 -Subject: [PATCH] meson: fix build by adding missing files - -fixes https://github.com/facebook/zstd/issues/2519 ---- - build/meson/lib/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build -index 17806c8dc..004888753 100644 ---- a/build/meson/lib/meson.build -+++ b/build/meson/lib/meson.build -@@ -22,6 +22,7 @@ libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'), - join_paths(zstd_rootdir, 'lib/common/threading.c'), - join_paths(zstd_rootdir, 'lib/common/pool.c'), - join_paths(zstd_rootdir, 'lib/common/zstd_common.c'), -+ join_paths(zstd_rootdir, 'lib/common/zstd_trace.c'), - join_paths(zstd_rootdir, 'lib/common/error_private.c'), - join_paths(zstd_rootdir, 'lib/common/xxhash.c'), - join_paths(zstd_rootdir, 'lib/compress/hist.c'), From ee99c226bb863afd4b2c0166e513257b6794c145 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 12 Aug 2021 16:53:39 +0000 Subject: [PATCH 2/2] scripts/extract: less zealous quoting Don't quote TAR_OPTS or PKG_TAR_COPY_OPTS on purpose as these are (or could be) lists of options to tar. Signed-off-by: Ian Leonard --- scripts/extract | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/extract b/scripts/extract index 24fb5e2bf6..c02e260a2d 100755 --- a/scripts/extract +++ b/scripts/extract @@ -49,11 +49,11 @@ fi case "${PKG_SOURCE_NAME}" in *.tar | *.tar.bz2 | *.tbz | *.tar.gz | *.tgz | *.tar.xz | *.txz) mkdir -p "${DESTDIR}" - tar xf "${FULL_SOURCE_PATH}" "${TAR_OPTS}" -C "${DESTDIR}" + tar xf "${FULL_SOURCE_PATH}" ${TAR_OPTS} -C "${DESTDIR}" ;; *.tar.zst | *.tzst) mkdir -p "${DESTDIR}" - zstdcat "${FULL_SOURCE_PATH}" | tar xf - "${TAR_OPTS}" -C "${DESTDIR}" + zstdcat "${FULL_SOURCE_PATH}" | tar xf - ${TAR_OPTS} -C "${DESTDIR}" ;; *.7z) mkdir -p "${2}/${1}" @@ -74,6 +74,6 @@ case "${PKG_SOURCE_NAME}" in *) FULL_DEST_PATH="${2}/${PKG_NAME}-${PKG_VERSION}" mkdir "${FULL_DEST_PATH}" - tar cf - -C "${FULL_SOURCE_PATH}" "${PKG_TAR_COPY_OPTS}" . | tar xf - -C "${FULL_DEST_PATH}" + tar cf - -C "${FULL_SOURCE_PATH}" ${PKG_TAR_COPY_OPTS} . | tar xf - -C "${FULL_DEST_PATH}" ;; esac