jsonc: additional include directory

added an addtional include directory 'include/json-c' to satify tpm2-tss. Issue: gapfruit#1619 Issue: genodelabs#383
trimpim · Jan 27, 2025 · 0b4dfdd · 0b4dfdd
1 parent 97e8e09
commit 0b4dfdd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/import/import-jsonc.mk b/lib/import/import-jsonc.mk
@@ -1 +1,4 @@
-INC_DIR += $(call select_from_ports,jsonc)/include/jsonc
+JSONC_PORT_DIR := $(call select_from_ports,jsonc)
+
+INC_DIR += $(JSONC_PORT_DIR)/include
+INC_DIR += $(JSONC_PORT_DIR)/include/json-c
diff --git a/ports/jsonc.hash b/ports/jsonc.hash
@@ -1 +1 @@
-dd87c15fcc3ebf95995928e8e12e2121b24ca5ed
+e554ac152aa8d9557cdebe4f50c5ff2ba6105515
diff --git a/ports/jsonc.port b/ports/jsonc.port
@@ -6,8 +6,8 @@ URL(jsonc) := https://github.com/json-c/json-c.git
 REV(jsonc) := f8eb1dec64440d68149ce6ac70756af18a90bfb9
 DIR(jsonc) := src/lib/jsonc
 
-DIRS += include/jsonc
-DIR_CONTENT(include/jsonc) := src/lib/jsonc/*.h
+DIRS += include/json-c
+DIR_CONTENT(include/json-c) := src/lib/jsonc/*.h
 
 PATCHES += src/lib/jsonc/jsonc_config.patch
 PATCHES += src/lib/jsonc/jsonc_json_config.patch

diff --git a/recipes/api/jsonc/content.mk b/recipes/api/jsonc/content.mk
@@ -8,7 +8,7 @@ $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
 include:
-	mkdir -p "$(dir $@)"
+	mkdir -p $@
 	cp -R $(PORT_DIR)/include/* $@
 
 LICENSE:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dd87c15fcc3ebf95995928e8e12e2121b24ca5ed
		e554ac152aa8d9557cdebe4f50c5ff2ba6105515