Skip to content

Commit 0b4dfdd

Browse files
throwExceptiontrimpim
authored andcommitted
jsonc: additional include directory
added an addtional include directory 'include/json-c' to satify tpm2-tss. Issue: gapfruit#1619 Issue: genodelabs#383
1 parent 97e8e09 commit 0b4dfdd

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

lib/import/import-jsonc.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
INC_DIR += $(call select_from_ports,jsonc)/include/jsonc
1+
JSONC_PORT_DIR := $(call select_from_ports,jsonc)
2+
3+
INC_DIR += $(JSONC_PORT_DIR)/include
4+
INC_DIR += $(JSONC_PORT_DIR)/include/json-c

ports/jsonc.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dd87c15fcc3ebf95995928e8e12e2121b24ca5ed
1+
e554ac152aa8d9557cdebe4f50c5ff2ba6105515

ports/jsonc.port

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ URL(jsonc) := https://github.com/json-c/json-c.git
66
REV(jsonc) := f8eb1dec64440d68149ce6ac70756af18a90bfb9
77
DIR(jsonc) := src/lib/jsonc
88

9-
DIRS += include/jsonc
10-
DIR_CONTENT(include/jsonc) := src/lib/jsonc/*.h
9+
DIRS += include/json-c
10+
DIR_CONTENT(include/json-c) := src/lib/jsonc/*.h
1111

1212
PATCHES += src/lib/jsonc/jsonc_config.patch
1313
PATCHES += src/lib/jsonc/jsonc_json_config.patch

recipes/api/jsonc/content.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(MIRROR_FROM_REP_DIR):
88
$(mirror_from_rep_dir)
99

1010
include:
11-
mkdir -p "$(dir $@)"
11+
mkdir -p $@
1212
cp -R $(PORT_DIR)/include/* $@
1313

1414
LICENSE:

0 commit comments

Comments
 (0)