diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2023-06-26 13:11:21 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-07-16 22:06:31 +0200 |
| commit | 967381a5990c7b637dffddf80d90104315a6b123 (patch) | |
| tree | 0375f5421efc319513aabff79b8dd55c112c01a2 /scripts | |
| parent | d1075600496643064ac508993219952a7ecb345a (diff) | |
`get-and-build-libndpi.sh` uses GMake MAKEFLAGS for sub-make (required for e.g. jobserver)
* fixed invalid CMake `test -r ...`
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get-and-build-libndpi.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/get-and-build-libndpi.sh b/scripts/get-and-build-libndpi.sh index ae88cd1d1..25f1916cc 100755 --- a/scripts/get-and-build-libndpi.sh +++ b/scripts/get-and-build-libndpi.sh @@ -26,6 +26,10 @@ if [ ! -z "${CC}" ]; then HOST_TRIPLET="$(${CC} ${CFLAGS} -dumpmachine)" fi +if [ ! -z "${MAKEFLAGS}" ]; then + MAKEFLAGS="-${MAKEFLAGS}" +fi + cat <<EOF ------ environment variables ------ HOST_TRIPLET=${HOST_TRIPLET} @@ -38,6 +42,7 @@ CFLAGS=${CFLAGS:-} LDFLAGS=${LDFLAGS:-} ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-} MAKE_PROGRAM=${MAKE_PROGRAM:-} +MAKEFLAGS=${MAKEFLAGS} DEST_INSTALL=${DEST_INSTALL:-} ----------------------------------- EOF @@ -84,6 +89,6 @@ HOST_ARG="--host=${HOST_TRIPLET}" ./autogen.sh --enable-option-checking=fatal \ --prefix="/" \ --with-only-libndpi ${HOST_ARG} ${ADDITIONAL_ARGS} -${MAKE_PROGRAM} install DESTDIR="${DEST_INSTALL}" +${MAKE_PROGRAM} ${MAKEFLAGS} install DESTDIR="${DEST_INSTALL}" rm -f "${LOCKFILE}" |