Merge 2.4 patches to 2.6 kernel.

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

diff --git a/openwrt/package/iperf/Makefile b/openwrt/package/iperf/Makefile
index 872edd2..dc12dc0 100644 (file)
--- a/openwrt/package/iperf/Makefile
+++ b/openwrt/package/iperf/Makefile
@@ -1,3 +1,5 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iperf
@@ -15,13 +17,13 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,IPERF,iperf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
+               LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                LIBS="-luClibc++ -lc -lm -lgcc_s" \
                ac_cv_func_malloc_0_nonnull=yes \
                ./configure \
@@ -61,7 +63,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_IPERF):
        install -d -m0755 $(IDIR_IPERF)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin
        $(RSTRIP) $(IDIR_IPERF)
        $(IPKG_BUILD) $(IDIR_IPERF) $(PACKAGE_DIR)