diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2020-10-24 15:37:40 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2020-10-24 15:37:40 +0000 |
| commit | e9e5f223fc4d3936c2b139f619d8ae200ae59143 (patch) | |
| tree | c04d0b22477ecb1f01aa0c1b613a012e275f7ebc /net/ndpi/files/patch-src_lib_Makefile.in | |
| parent | Update third-party naxsi module from 0.56 to 1.1a. (diff) | |
- Update ndpi to 3.4 branch
- Update ntopng to latest upstream stable commit
Notes
Notes:
svn path=/head/; revision=553201
Diffstat (limited to 'net/ndpi/files/patch-src_lib_Makefile.in')
| -rw-r--r-- | net/ndpi/files/patch-src_lib_Makefile.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in index 54d0aa39755f..e97fe31a11a2 100644 --- a/net/ndpi/files/patch-src_lib_Makefile.in +++ b/net/ndpi/files/patch-src_lib_Makefile.in @@ -1,9 +1,9 @@ - /bin/rm -f libndpi.a $(OBJECTS) new file mode 100644 ---- src/lib/Makefile.in.orig 2019-10-21 13:36:38 UTC +--- src/lib/Makefile.in.orig 2020-10-19 14:18:25 UTC +++ src/lib/Makefile.in -@@ -17,24 +17,15 @@ CC = @CC@ - CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g -Wall +@@ -18,30 +18,17 @@ CFLAGS += -fPIC -DPIC -I../include -Ithird_party/i + LDFLAGS = @LDFLAGS@ @ADDITIONAL_LIBS@ @LIBS@ RANLIB = ranlib -OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) @@ -19,13 +19,19 @@ new file mode 100644 -ifneq ($(OS),Windows_NT) -OS := $(shell uname) -endif -- + BUILD_MINGW = @BUILD_MINGW@ + -ifeq ($(OS),Darwin) -CC=clang -SONAME_FLAG= -else +-ifneq ($(BUILD_MINGW),) +-NDPI_LIB_SHARED_BASE = libndpi +-NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE)-@NDPI_VERSION_SHORT@.dll +-else SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) -endif +-endif all: $(NDPI_LIBS) |