From 9c1c926ad4885b60f5c5b38cac8f18ebfceb2805 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 16 May 2023 14:01:23 +0200 Subject: [PATCH] Fix ndpi-netfilter compilation on all platforms --- ndpi-netfilter2/Makefile | 2 ++ ndpi-netfilter2/patches/outline-atomics.patch | 14 +++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile index a91cdaaf7..7eee4b671 100644 --- a/ndpi-netfilter2/Makefile +++ b/ndpi-netfilter2/Makefile @@ -20,6 +20,8 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/vel21ripn/nDPI.git PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_BUILD_PARALLEL:=0 + PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk diff --git a/ndpi-netfilter2/patches/outline-atomics.patch b/ndpi-netfilter2/patches/outline-atomics.patch index a0935ecea..72dace62c 100644 --- a/ndpi-netfilter2/patches/outline-atomics.patch +++ b/ndpi-netfilter2/patches/outline-atomics.patch @@ -1,17 +1,13 @@ --- a/ndpi-netfilter/src/Makefile 2022-08-03 21:27:52.321058402 +0200 +++ b/ndpi-netfilter/src/Makefile 2022-08-03 21:28:27.572452447 +0200 -@@ -5,6 +5,14 @@ +@@ -5,6 +5,10 @@ ccflags-y += -I${src}/${NDPI_SRC}/include -I${src}/${NDPI_SRC}/lib -I${src}/../libre -I${src}/${NDPI_SRC}/lib/third_party/include ccflags-y += -DHAVE_CONFIG_H -DNDPI_LIB_COMPILATION -DOPENDPI_NETFILTER_MODULE -DNDPI_DETECTION_SUPPORT_IPV6 -g ccflags-y += -Wno-declaration-after-statement -+ifneq ($(KERNEL_RELEASE),5.4) -+ifeq ($(ARCH),arm64) -+ ccflags-y += -mno-outline-atomics -+endif -+ifeq ($(ARCH),aarch64) -+ ccflags-y += -mno-outline-atomics -+endif -+endif ++cc-option = $(shell if $(CC) -Werror $(1) -S -o /dev/null -xc /dev/null \ ++ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) ++mno_outline_atomics := $(call cc-option, -mno-outline-atomics, "") ++ccflags-y += $(mno_outline_atomics) #ccflags-y += -Wshadow-local # Needed for pahole #ccflags-y += -femit-struct-debug-detailed=any