Skip to content

V3.0.3 upgrade json #5155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: v3.0
Choose a base branch
from
Open

V3.0.3 upgrade json #5155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96021e4
upgrade json to v3.12.0
mirostauder Oct 22, 2025
3c3dddb
fix include paths for default build
mirostauder Oct 22, 2025
f25c614
fix include paths for tap test build
mirostauder Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ deps/coredumper/coredumper-*/
deps/postgresql/postgresql-*/
deps/postgresql/postgres-*/
deps/libusual/libusual-*/
deps/json/json-*/

test/.vagrant
.DS_Store
Expand Down
11 changes: 10 additions & 1 deletion deps/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ targets := check_openssl_version \
prometheus-cpp \
postgresql \
libusual \
libscram
libscram \
json

ifeq ($(UNAME_S),Linux)
targets += coredumper
Expand Down Expand Up @@ -330,6 +331,14 @@ libscram/lib/libscram.a:postgresql/postgresql/src/interfaces/libpq/libpq.a
libscram: libscram/lib/libscram.a


json/json/include/nlohmann/json.hpp:
cd json && rm -rf json-*/ || true
cd json && tar -zxf json-*.tar.gz
cd json/json && cmake .
Comment on lines +335 to +337
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

This build rule for the json dependency is missing a step to create a symbolic link. The command cd json/json on line 334 will fail because deps/json/json is a file, not a directory. You should add a command to create a symlink after extracting the tarball. The corrected rule should look like this:

json/json/include/nlohmann/json.hpp:
	cd json && rm -rf json-*/ || true
	cd json && tar -zxf json-*.tar.gz
	cd json && ln -fs json-*/ json
	cd json/json && cmake .


json: json/json/include/nlohmann/json.hpp


### clean targets

cleanpart:
Expand Down
1 change: 1 addition & 0 deletions deps/json/json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
json-3.12.0
Binary file added deps/json/json-3.12.0.tar.gz
View file
Open in desktop
Binary file not shown.
Loading