Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot-automerge] zstd v1.5.4 #67

Prev Previous commit
Next Next commit
Add patch to avoid COS7 update
hmaarrfk committed Feb 11, 2023
commit 8671730a8662330bec9ea26edfd0006e6b255341
8 changes: 8 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -7,6 +7,14 @@ package:
source:
url: https://github.com/facebook/zstd/archive/v{{ version }}.tar.gz
sha256: 35ad983197f8f8eb0c963877bf8be50490a0b3df54b4edeb8399ba8a8b2f60a4
patches:
# 2023/02 hmarrrfk
# it seems that this is just a test program that isn't installed
# it requires clock_gettime and we don't want to upgrade
# to COS7 at conda-forge yet
# https://github.com/conda-forge/conda-forge.github.io/issues/1436
# By not building it, we can continue to support COS6 easily
- no-zstd-frugal.patch

build:
number: 0
15 changes: 15 additions & 0 deletions recipe/no-zstd-frugal.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/build/cmake/programs/CMakeLists.txt b/build/cmake/programs/CMakeLists.txt
index 58d998e4..2d5fb46b 100644
--- a/build/cmake/programs/CMakeLists.txt
+++ b/build/cmake/programs/CMakeLists.txt
@@ -75,9 +75,6 @@ if (UNIX)
${CMAKE_CURRENT_BINARY_DIR}/zstdless.1
DESTINATION "${MAN_INSTALL_DIR}")

- add_executable(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/fileio_asyncio.c)
- target_link_libraries(zstd-frugal ${PROGRAMS_ZSTD_LINK_TARGET})
- set_property(TARGET zstd-frugal APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT;ZSTD_NOTRACE")
endif ()

# Add multi-threading support definitions