diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2024-08-16 15:19:24 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2024-08-19 13:22:10 +0200 |
| commit | 90306a2f6d3cd62c5900d158f491e9682af5b4ae (patch) | |
| tree | b1b4732f229bc0daeb951a968ea057a0b8355e47 | |
| parent | 2975d692954502d75c7fffce62a245548ea1e73e (diff) | |
Fixed CI build.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rw-r--r-- | packages/openwrt/net/nDPId-testing/Makefile | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6d2839f3..5b89a123c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,14 +228,14 @@ jobs: -o /tmp/a.out \ -lpcap $(pkg-config --libs libndpi) -pthread -lm cc -Wall -Wextra -std=gnu99 \ - ${{ matrix.poll }} -DENABLE_MEMORY_PROFILING=1 \ + ${{ matrix.poll }} -DENABLE_MEMORY_STATUS=1 -DENABLE_MEMORY_PROFILING=1 \ nDPIsrvd.c nio.c utils.c \ -I. -I./dependencies -I./dependencies/jsmn -I./dependencies/uthash/include \ -o /tmp/a.out - name: Build single nDPId/nDPIsrvd executables (invoke CC directly - static nDPI lib) if: endsWith(matrix.compiler, 'gcc-7') == false && startsWith(matrix.ndpi_build, '-DBUILD_NDPI=ON') && startsWith(matrix.coverage, '-DENABLE_COVERAGE=OFF') && startsWith(matrix.sanitizer, '-DENABLE_SANITIZER=ON') && startsWith(matrix.ndpid_gcrypt, '-DNDPI_WITH_GCRYPT=OFF') && startsWith(matrix.ndpid_zlib, '-DENABLE_ZLIB=ON') run: | - cc -Wall -Wextra -std=gnu99 ${{ matrix.poll }} -DENABLE_ZLIB=1 -DENABLE_MEMORY_PROFILING=1 \ + cc -Wall -Wextra -std=gnu99 ${{ matrix.poll }} -DENABLE_ZLIB=1 -DENABLE_MEMORY_STATUS=1 -DENABLE_MEMORY_PROFILING=1 \ -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=enum -fsanitize=leak \ nDPId.c nio.c utils.c \ -I./build/libnDPI/include/ndpi -I. -I./dependencies -I./dependencies/jsmn -I./dependencies/uthash/include \ @@ -290,7 +290,7 @@ jobs: git clone --depth=1 https://github.com/ntop/PF_RING.git cd PF_RING && make all && sudo make install prefix=/usr cd .. - cc -Wall -Wextra -std=gnu99 ${{ matrix.poll }} -DENABLE_PFRING=1 -DENABLE_ZLIB=1 -DENABLE_MEMORY_PROFILING=1 \ + cc -Wall -Wextra -std=gnu99 ${{ matrix.poll }} -DENABLE_PFRING=1 -DENABLE_ZLIB=1 -DENABLE_MEMORY_STATUS=1 -DENABLE_MEMORY_PROFILING=1 \ -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=enum -fsanitize=leak \ nDPId.c npfring.c nio.c utils.c \ -I. -I./dependencies -I./dependencies/jsmn -I./dependencies/uthash/include \ diff --git a/packages/openwrt/net/nDPId-testing/Makefile b/packages/openwrt/net/nDPId-testing/Makefile index 2a7654dd1..0d21edd3d 100644 --- a/packages/openwrt/net/nDPId-testing/Makefile +++ b/packages/openwrt/net/nDPId-testing/Makefile @@ -83,6 +83,7 @@ TARGET_CFLAGS += -DLIBNDPI_STATIC=1 TARGET_CFLAGS += -Werror ifneq ($(CONFIG_NDPID_TESTING_PFRING),) +# FIXME: PFRING kernel include directory is hardcoded (not installed to linux header directory). CMAKE_OPTIONS += -DENABLE_PFRING=ON \ -DPFRING_KERNEL_INC="$(KERNEL_BUILD_DIR)/PF_RING-8.4.0/kernel" \ -DPFRING_INSTALLDIR="$(STAGING_DIR)/usr" \ |