make gcc4 depend on libgcc, and disable the libgcc hack for it

[openwrt.git] / openwrt / package / nmap / Makefile

diff --git a/openwrt/package/nmap/Makefile b/openwrt/package/nmap/Makefile
index 6e685b4..23997b8 100644 (file)
--- a/openwrt/package/nmap/Makefile
+++ b/openwrt/package/nmap/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
 PKG_VERSION:=3.81
 
 PKG_NAME:=nmap
 PKG_VERSION:=3.81

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MD5SUM:=0713306dda85aee2c95ef31b4b7d2838
 
 PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
 PKG_MD5SUM:=0713306dda85aee2c95ef31b4b7d2838
 
 PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist


@@ -23,9 +23,10 @@ $(PKG_BUILD_DIR)/.configured:
                $(TARGET_CONFIGURE_OPTS) \
                libpcapdir="$(STAGING_DIR)/usr/lib" \
                CFLAGS="$(TARGET_CFLAGS)" \
                $(TARGET_CONFIGURE_OPTS) \
                libpcapdir="$(STAGING_DIR)/usr/lib" \
                CFLAGS="$(TARGET_CFLAGS)" \

-               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs " \
+               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \

                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \

-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib  -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm" \
+               LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LIBS="-luClibc++ -lc -lm -lgcc" \

                ac_cv_prog_CXX="$(TARGET_CXX)" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                ac_cv_prog_CXX="$(TARGET_CXX)" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \


@@ -48,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
                  --without-openssl \
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
                  --without-openssl \

+                 --without-nmapfe \

                  --with-libpcap="$(STAGING_DIR)/usr" \
                  --with-libpcre="$(STAGING_DIR)/usr" \
        );
                  --with-libpcap="$(STAGING_DIR)/usr" \
                  --with-libpcre="$(STAGING_DIR)/usr" \
        );


@@ -57,7 +59,7 @@ $(PKG_BUILD_DIR)/.built:
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)" \
+               CCOPT="$(TARGET_CFLAGS) -fno-builtin -nostdinc++" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        touch $@
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        touch $@


@@ -65,9 +67,13 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_NMAP):
        install -d -m0755 $(IDIR_NMAP)/usr/share/nmap
        for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \
 $(IPKG_NMAP):
        install -d -m0755 $(IDIR_NMAP)/usr/share/nmap
        for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \

-               cp -fpR $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$file $(IDIR_NMAP)/usr/share/nmap; \
+               $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$file $(IDIR_NMAP)/usr/share/nmap; \

        done
        install -d -m0755 $(IDIR_NMAP)/usr/bin
        done
        install -d -m0755 $(IDIR_NMAP)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/

        $(RSTRIP) $(IDIR_NMAP)
        $(IPKG_BUILD) $(IDIR_NMAP) $(PACKAGE_DIR)
        $(RSTRIP) $(IDIR_NMAP)
        $(IPKG_BUILD) $(IDIR_NMAP) $(PACKAGE_DIR)

+
+mostlyclean:
+       $(MAKE) -C $(PKG_BUILD_DIR) clean
+       rm $(PKG_BUILD_DIR)/.built