Skip to content

Commit 646dc24

Browse files
committed
freshen json-c overlay
1 parent 3939dcb commit 646dc24

File tree

5 files changed

+34
-71
lines changed

5 files changed

+34
-71
lines changed

vcpkg-overlays/omit-json-c-apps/json-c/disable-duplocale.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--- a/CMakeLists.txt
22
+++ b/CMakeLists.txt
3-
@@ -202,6 +202,12 @@
4-
exec_program(${CMAKE_C_COMPILER} ARGS -dumpmachine OUTPUT_VARIABLE CMAKE_GNU_C_MACHINE)
3+
@@ -183,6 +183,12 @@
4+
55
if (CMAKE_GNU_C_MACHINE MATCHES "uclibc")
66
message(STATUS "Detected uClibc compiler, disabling locale handling")
77
+ set(HAVE_SETLOCALE 0)

vcpkg-overlays/omit-json-c-apps/json-c/fix-clang-cl.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

vcpkg-overlays/omit-json-c-apps/json-c/pkgconfig.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
1-
vcpkg_from_github(
2-
OUT_SOURCE_PATH SOURCE_PATH
3-
REPO json-c/json-c
4-
REF b4c371fa0cbc4dcbaccc359ce9e957a22988fb34
5-
SHA512 1338271a6f9ffb3b8a8d4f2ec36a374ed84b3c91f789b607693c08cbeb38c4fdd813593f530ff94e841a095ff367a3ae8c5f5e7dbcb64e8f9044f6affdf24505
6-
HEAD_REF master
7-
PATCHES pkgconfig.patch
8-
fix-clang-cl.patch
9-
disable-duplocale.patch
10-
)
11-
12-
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSON_BUILD_STATIC)
13-
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JSON_BUILD_SHARED)
14-
15-
vcpkg_cmake_configure(
16-
SOURCE_PATH "${SOURCE_PATH}"
17-
OPTIONS
18-
-DBUILD_APPS=OFF
19-
-DBUILD_TESTING=OFF
20-
-DBUILD_STATIC_LIBS=${JSON_BUILD_STATIC}
21-
-DBUILD_SHARED_LIBS=${JSON_BUILD_SHARED}
22-
)
23-
24-
vcpkg_cmake_install()
25-
26-
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
27-
vcpkg_fixup_pkgconfig()
28-
vcpkg_copy_pdbs()
29-
30-
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
31-
32-
# Handle copyright
33-
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
1+
vcpkg_from_github(
2+
OUT_SOURCE_PATH SOURCE_PATH
3+
REPO json-c/json-c
4+
REF "json-c-${VERSION}"
5+
SHA512 219d8c0da9a4016b74af238cc15dbec1f369a07de160bcc548d80279028e1b5d8d928deb13fec09c96a085fc0ecf10090e309cbe72d0081aca864433c4ae01db
6+
HEAD_REF master
7+
PATCHES disable-duplocale.patch
8+
)
9+
10+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSON_BUILD_STATIC)
11+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JSON_BUILD_SHARED)
12+
13+
vcpkg_cmake_configure(
14+
SOURCE_PATH "${SOURCE_PATH}"
15+
OPTIONS
16+
-DBUILD_APPS=OFF
17+
-DBUILD_TESTING=OFF
18+
-DBUILD_STATIC_LIBS=${JSON_BUILD_STATIC}
19+
-DBUILD_SHARED_LIBS=${JSON_BUILD_SHARED}
20+
)
21+
22+
vcpkg_cmake_install()
23+
24+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
25+
vcpkg_fixup_pkgconfig()
26+
vcpkg_copy_pdbs()
27+
28+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
29+
30+
# Handle copyright
31+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

vcpkg-overlays/omit-json-c-apps/json-c/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "json-c",
3-
"version-date": "2023-08-12",
3+
"version": "0.18-20240915",
44
"description": "A JSON implementation in C",
55
"homepage": "https://github.com/json-c/json-c",
66
"license": "MIT",

0 commit comments

Comments
 (0)