mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

Merge pull request #285585 from Kiskae/yajl/2024-02-01

Browse source 
yajl: unstable-2022-04-20 -> 2.1.0-unstable-2024-02-01
This commit is contained in:
Sandro 2024-02-25 18:16:48 +01:00 committed by GitHub
parent 7cb5b6a73f f6f64ba4fb
commit bd4bf48e31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
pkgs/development/libraries/yajl/cmake-shared-static-fix.patch
View file

@ -1,89 +0,0 @@
From 768be8b9f98e30a8bd2d51576be9dfcf2cb838ea Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 26 Sep 2023 20:53:00 +0200
Subject: [PATCH] simplify compilation of static/shared with cmake
Signed-off-by: Kiskae <Kiskae@users.noreply.github.com>
---
CMakeLists.txt | 2 ++
example/CMakeLists.txt | 2 +-
perf/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 7 ++-----
test/parsing/CMakeLists.txt | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 471eee13..9af25203 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(YetAnotherJSONParser C)
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+
SET (YAJL_MAJOR 2)
SET (YAJL_MINOR 1)
SET (YAJL_MICRO 1)
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 0a7f6220..62ddf14c 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
ADD_EXECUTABLE(parse_config ${SRCS})
-TARGET_LINK_LIBRARIES(parse_config yajl_s)
+TARGET_LINK_LIBRARIES(parse_config yajl)
diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt
index b438d7a1..924a2681 100644
--- a/perf/CMakeLists.txt
+++ b/perf/CMakeLists.txt
@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
ADD_EXECUTABLE(perftest ${SRCS})
-TARGET_LINK_LIBRARIES(perftest yajl_s)
+TARGET_LINK_LIBRARIES(perftest yajl)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 789ddf99..78875032 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,9 +35,7 @@ SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig
# set the output path for libraries
SET(LIBRARY_OUTPUT_PATH ${libDir})
-ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS})
-
-ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
+ADD_LIBRARY(yajl ${SRCS} ${HDRS} ${PUB_HDRS})
#### setup shared library version number
SET_TARGET_PROPERTIES(yajl PROPERTIES
@@ -69,7 +67,7 @@ FOREACH (header ${PUB_HDRS})
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir})
- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD
+ ADD_CUSTOM_COMMAND(TARGET yajl POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir})
ENDFOREACH (header ${PUB_HDRS})
@@ -81,7 +79,6 @@ INSTALL(TARGETS yajl
RUNTIME DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})
-INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
diff --git a/test/parsing/CMakeLists.txt b/test/parsing/CMakeLists.txt
index c22a3887..f445920d 100644
--- a/test/parsing/CMakeLists.txt
+++ b/test/parsing/CMakeLists.txt
@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib)
ADD_EXECUTABLE(yajl_test ${SRCS})
-TARGET_LINK_LIBRARIES(yajl_test yajl_s)
+TARGET_LINK_LIBRARIES(yajl_test yajl)

11
pkgs/development/libraries/yajl/default.nix
View file

@ -2,20 +2,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "yajl";
version = "unstable-2022-04-20";
version = "2.1.0-unstable-2024-02-01";
src = fetchFromGitHub {
owner = "containers";
repo = "yajl";
rev = "49923ccb2143e36850bcdeb781e2bcdf5ce22f15";
hash = "sha256-9bMPA5FpyBp8fvG/kkT/MnhYtdqg3QzOnmDFXKwJVW0=";
rev = "6bc5219389fd2752631682b0a8368e6d8218a8c5";
hash = "sha256-vY0tqCkz6PN00Qbip5ViO64L3C06fJ4JjFuIk0TWgCo=";
};
patches = [
# https://github.com/containers/yajl/pull/1
./cmake-shared-static-fix.patch
];
nativeBuildInputs = [ cmake ];
doCheck = true;