Skip to content

QuickJS-NG: Add discovery via pkg-config + add compat for different JS_IsError signature #988

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

Closed
wants to merge 2 commits into from
+41 −0
Closed

QuickJS-NG: Add discovery via pkg-config + add compat for different JS_IsError signature #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4842185
quickjs_compat.h: Added a compat macro for Js_IsError for quickjs-ng
BalkanMadman Nov 18, 2025
b31b34a
auto/quickjs, nginx/config: Used pkg-config to find quickjs-ng
BalkanMadman Nov 18, 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
18 changes: 18 additions & 0 deletions auto/quickjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ NJS_QUICKJS_LIB=
NJS_HAVE_QUICKJS=NO
NJS_QUICKJS_DEFAULT_INCS="src $NJS_BUILD_DIR"

# Alternative pkg-config binary can be supplied by setting the PKG_CONFIG
# environment variable.
: "${PKG_CONFIG:=pkg-config}"

if [ $NJS_TRY_QUICKJS = YES ]; then
njs_found=no

Expand Down Expand Up @@ -57,6 +61,20 @@ if [ $NJS_TRY_QUICKJS = YES ]; then
. auto/feature
fi

if [ $njs_found = no ]; then
njs_feature="QuickJS-NG library via pkg-config"

flags="$("${PKG_CONFIG}" --cflags-only-I quickjs-ng)"
# Trim the -I prefix from includes.
pkg_config_includes="$(printf "%s\n" "$flags" | sed 's|-I||g')"
pkg_config_libs="$("${PKG_CONFIG}" --libs quickjs-ng)"

njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS ${pkg_config_includes}"
njs_feature_libs="-lm -ldl -lpthread ${pkg_config_libs}"

. auto/feature
fi


if [ $njs_found = yes ]; then

Expand Down
19 changes: 19 additions & 0 deletions nginx/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ NJS_QUICKJS_INC=
NJS_QUICKJS_DEFAULT_INCS="$ngx_addon_dir/../src $ngx_addon_dir/../build"
NJS_HAVE_QUICKJS=

# Alternative pkg-config binary can be supplied by setting the PKG_CONFIG
# environment variable.
: "${PKG_CONFIG:=pkg-config}"

if [ $NJS_QUICKJS != NO ]; then

ngx_feature="QuickJS library -lquickjs.lto"
Expand Down Expand Up @@ -71,6 +75,21 @@ if [ $NJS_QUICKJS != NO ]; then
. auto/feature
fi

if [ $ngx_found = no ]; then
ngx_feature="QuickJS-NG library via pkg-config"

flags="$("${PKG_CONFIG}" --cflags-only-I quickjs-ng)"
# Trim the -I prefix from includes.
pkg_config_includes="$(printf "%s\n" "$flags" | sed 's|-I||g')"
pkg_config_libs="$("${PKG_CONFIG}" --libs quickjs-ng)"

ngx_feature_path="$NJS_QUICKJS_DEFAULT_INCS ${pkg_config_includes}"
ngx_feature_libs="-lm -ldl -lpthread ${pkg_config_libs}"

. auto/feature
fi


if [ $ngx_found = yes ]; then

ngx_feature="QuickJS JS_GetClassID()"
Expand Down
4 changes: 4 additions & 0 deletions src/quickjs_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@
#ifndef JS_BOOL
#define JS_BOOL bool
#endif

#ifdef QUICKJS_NG
#define JS_IsError(cx, val) JS_IsError(val)
#endif