mpd: uClibc-0.9.31 fix

[openwrt/svn-archive/archive.git] / net / rrs / Makefile

diff --git a/net/rrs/Makefile b/net/rrs/Makefile
index 16d19925b11a470c85cec5cc41447cab72b214bc..4ff8441f43467a5072d1488cf5c7309f5e44af6c 100644 (file)
--- a/net/rrs/Makefile
+++ b/net/rrs/Makefile
@@ -4,68 +4,86 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrs
 PKG_VERSION:=1.70
-PKG_RELEASE:=1
-PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0
-
-PKG_SOURCE_URL:=http://www.cycom.se/uploads/36/19 
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=http://www.cycom.se/uploads/36/19 
+PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/rrs/Default
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+uclibcxx
+  TITLE:=A reverse (connecting) remote shell
+  URL:=http://www.cycom.se/dl/rrs/
+endef
+
 define Package/rrs
+$(call Package/rrs/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx +libopenssl
-  TITLE:=A reverse (connecting) remote shell, with SSL support
-  DESCRIPTION:=A reverse (connecting) remote shell, built with SSL support.
+  DEPENDS+= +libopenssl
+  TITLE+= (with SSL support)
   URL:=http://www.cycom.se/dl/rrs/
 endef
 
 define Package/rrs-nossl
+$(call Package/rrs/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx 
-  TITLE:=A reverse (connecting) remote shell, without SSL support
-  DESCRIPTION:=A reverse (connecting) remote shell, built with SSL support.
-  URL:=http://www.cycom.se/dl/rrs/
+  TITLE+= (without SSL support)
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)" \
-               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; )
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               clean
+
+define Build/Template
+
+$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
-               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; )
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \
+               LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \
+               LDFLAGSNOSSL="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \
+               $(3)
+       ( cd $(PKG_BUILD_DIR); mv -f rrs rrs-$(2); )
+       touch $$@
+
+$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
+
+define Package/$(1)/install
+       $(INSTALL_DIR) $$(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-$(2) $$(1)/usr/bin/rrs
 endef
 
-define Package/rrs/install     
-       install -d -m0755 $(1)/usr/bin
-       install -m0755 $(PKG_BUILD_DIR)/rrs-ssl $(1)/usr/bin/rrs
 endef
 
-define Package/rrs-nossl/install       
-       install -d -m0755 $(1)/usr/bin
-       install -m0755 $(PKG_BUILD_DIR)/rrs-nossl $(1)/usr/bin/rrs
+
+define Build/Configure
 endef
 
+define Build/Compile
+endef
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrs),)
+  define Build/with-ssl
+    $(call Build/Template,rrs,with-ssl,generic,-lcrypto -lssl)
+  endef
+endif
+$(eval $(Build/with-ssl))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrs-nossl),)
+  define Build/without-ssl
+    $(call Build/Template,rrs-nossl,without-ssl,generic-nossl,)
+  endef
+endif
+$(eval $(Build/without-ssl))
+
+
 $(eval $(call BuildPackage,rrs))
 $(eval $(call BuildPackage,rrs-nossl))