mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
lz4: 1.9.4 -> 1.10.0 (#341282)
This commit is contained in:
commit
dbaedb9484
@ -1,34 +0,0 @@
|
||||
From 14fca2e93bd783c0ad2362af6d69801c2073765d Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Mayer <tobim@fastmail.fm>
|
||||
Date: Sun, 23 Jun 2024 20:16:00 +0200
|
||||
Subject: [PATCH] Create a unified lz4 target
|
||||
|
||||
Includes changes from
|
||||
* https://github.com/lz4/lz4/pull/1372
|
||||
* https://github.com/lz4/lz4/pull/1413
|
||||
---
|
||||
build/cmake/CMakeLists.txt | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
|
||||
index eb7007b..07ddd2b 100644
|
||||
--- a/build/cmake/CMakeLists.txt
|
||||
+++ b/build/cmake/CMakeLists.txt
|
||||
@@ -130,6 +130,14 @@ if(BUILD_STATIC_LIBS)
|
||||
POSITION_INDEPENDENT_CODE ${LZ4_POSITION_INDEPENDENT_LIB})
|
||||
list(APPEND LZ4_LIBRARIES_BUILT lz4_static)
|
||||
endif()
|
||||
+# Add unified target.
|
||||
+add_library(lz4 INTERFACE)
|
||||
+list(APPEND LZ4_LIBRARIES_BUILT lz4)
|
||||
+if(BUILD_SHARED_LIBS)
|
||||
+ target_link_libraries(lz4 INTERFACE lz4_shared)
|
||||
+else()
|
||||
+ target_link_libraries(lz4 INTERFACE lz4_static)
|
||||
+endif()
|
||||
|
||||
if(BUILD_STATIC_LIBS)
|
||||
set(LZ4_LINK_LIBRARY lz4_static)
|
||||
--
|
||||
2.45.1
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lz4";
|
||||
version = "1.9.4";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "lz4";
|
||||
owner = "lz4";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YiMCD3vvrG+oxBUghSrCmP2LAfAGZrEaKz0YoaQJhpI=";
|
||||
hash = "sha256-/dG1n59SKBaEBg72pAWltAtVmJ2cXxlFFhP+klrkTos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
outputs = [ "dev" "lib" "man" "out" ];
|
||||
|
||||
patches = [
|
||||
./0001-Create-a-unified-lz4-target.patch
|
||||
];
|
||||
|
||||
cmakeDir = "../build/cmake";
|
||||
cmakeBuildDir = "build-dist";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user