rename and simplify nmap patches, Makefile cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5349 3c298f89-4303-0410-b956-a3cf2f4a3e73
2006-10-30 13:54:43 +00:00
parent 5cb332fb35
commit 73a7d9879f
4 changed files with 48 additions and 64 deletions
--- a/net/nmap/patches/01-cross_compile.patch
+++ b/net/nmap/patches/01-cross_compile.patch
@ -0,0 +1,30 @@
+#
+# Just assume pcap version is recent enough when cross-compiling
+#
+diff -ruN nmap-4.01-old/configure nmap-4.01-new/configure
+--- nmap-4.01-old/configure	2006-02-02 03:18:42.000000000 +0100
+++ nmap-4.01-new/configure	2006-10-23 22:08:15.000000000 +0200
+@@ -5765,9 +5765,9 @@
+ 
+ fi;
+ 
+-if test $linux = yes; then
+-  have_libpcap=no
+-fi
+#if test $linux = yes; then
+#  have_libpcap=no
+#fi
+ 
+ if test $needs_cpp_precomp = yes; then
+   CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
+@@ -5788,8 +5788,8 @@
+   echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
+ echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6
+   if test "$cross_compiling" = yes; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; have_libpcap=no
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; have_libpcap=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
--- a/net/nmap/patches/02-no_strip.patch
+++ b/net/nmap/patches/02-no_strip.patch
--- a/net/nmap/patches/cross-compile.patch
+++ b/net/nmap/patches/cross-compile.patch
@ -1,44 +0,0 @@
-diff -urN nmap-4.01.old/configure nmap-4.01.dev/configure
--- nmap-4.01.old/configure	2006-02-01 19:18:42.000000000 -0700
-+++ nmap-4.01.dev/configure	2006-03-29 23:14:28.000000000 -0700
-@@ -1341,12 +1341,6 @@
-    fi
- fi
- 
-libpcapdir=libpcap
-
-
-pcredir=libpcre
-
-
-           ac_config_headers="$ac_config_headers config.h"
- 
- 
-diff -urN nmap-4.01.old/Makefile.in nmap-4.01.dev/Makefile.in
--- nmap-4.01.old/Makefile.in	2006-02-09 19:22:27.000000000 -0700
-+++ nmap-4.01.dev/Makefile.in	2006-03-29 23:14:12.000000000 -0700
-@@ -29,7 +29,7 @@
- # CFLAGS = $(DEFS) $(INCLS)
- STATIC =
- LDFLAGS = @LDFLAGS@ $(STATIC)
-LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBS@
-+LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ -lpcre -lpcap @OPENSSL_LIBS@ -ldnet @LIBS@
- # LIBS =  -lefence @LIBS@
- # LIBS =  -lrmalloc @LIBS@
- SHTOOL = ./shtool
-@@ -68,15 +68,6 @@
- # all of the prerequisites (e.g. recursive makes and such)
- FORCE:
- 
-$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
-	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
-
-$(LIBDNETDIR)/src/.libs/libdnet.a: $(LIBDNETDIR)/Makefile FORCE
-	@echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE)
-
-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE
-	@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
-
- $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE
- 	@echo Compiling libnbase;
- 	cd $(NBASEDIR) && $(MAKE)