backport fixes from changeset:2408 to trunk

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

diff --git a/openwrt/package/rrs/Makefile b/openwrt/package/rrs/Makefile
index f7b2d5f..726dd00 100644 (file)
--- a/openwrt/package/rrs/Makefile
+++ b/openwrt/package/rrs/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=rrs
 PKG_VERSION:=1.70
 PKG_RELEASE:=1
-PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0 
+PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0
 
 PKG_SOURCE_URL:=http://www.cycom.se/uploads/36/19 
 
@@ -17,14 +17,14 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,RRS,rrs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        touch $@
 
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 ifneq ($(BR2_PACKAGE_RRS),)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -nostdinc++" \
+               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -fno-rtti -nostdinc++" \
                LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -luClibc++ -lc -lm -lutil -lssl -lcrypto" \
                generic
        ( cd $(PKG_BUILD_DIR); mv rrs rrs-ssl; )
@@ -34,7 +34,7 @@ endif
 ifneq ($(BR2_PACKAGE_RRS_NOSSL),)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -nostdinc++" \
+               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -fno-rtti -nostdinc++" \
                LDFLAGSNOSSL="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -luClibc++ -lc -lm -lutil" \
                generic-nossl
        ( cd $(PKG_BUILD_DIR); mv rrs rrs-nossl; )