diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
| commit | da133cad10885ca36be26b1b043c737e295a4cd4 (patch) | |
| tree | 3fb8e1189dce7188c4681144f96982d30c4511bd /package/nmap | |
| parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
| parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'package/nmap')
| -rw-r--r-- | package/nmap/Makefile | 1 | ||||
| -rw-r--r-- | package/nmap/patches/patch-liblinear_Makefile | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 6a756a4a9..09035c248 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -27,6 +27,7 @@ endif TARGET_CPPFLAGS+= -DNOLUA TARGET_LDFLAGS+= -lpthread +CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ diff --git a/package/nmap/patches/patch-liblinear_Makefile b/package/nmap/patches/patch-liblinear_Makefile new file mode 100644 index 000000000..fdb24470d --- /dev/null +++ b/package/nmap/patches/patch-liblinear_Makefile @@ -0,0 +1,16 @@ +--- nmap-6.40.orig/liblinear/Makefile 2011-09-23 23:15:09.000000000 +0200 ++++ nmap-6.40/liblinear/Makefile 2014-02-11 19:38:23.000000000 +0100 +@@ -1,10 +1,10 @@ + CXX ?= g++ + CC ?= gcc +-CFLAGS = -Wall -Wconversion -O3 -fPIC ++CFLAGS ?= -Wall -Wconversion -O3 -fPIC + LIBS = blas/blas.a + SHVER = 1 +-AR = ar +-RANLIB = ranlib ++AR ?= ar ++RANLIB ?= ranlib + #LIBS = -lblas + + all: train predict |