rrs:

 * Finally fixed the menu thing now
 * Use uClibc++ for the version without SSL support

SVN-Revision: 8228

diff --git a/net/rrs/Makefile b/net/rrs/Makefile
index c90dc0ce8f59d86a73df6e860fb6bc33f96478a2..c8408ea9a6549bdbed18cca1e8af7b444d06e1af 100644 (file)
--- a/net/rrs/Makefile
+++ b/net/rrs/Makefile
@@ -18,27 +18,23 @@ PKG_MD5SUM:=b400d03c0e39e3e78a7327ba78f789f0
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-define Package/rrs/Default
+define Package/rrs

   SECTION:=net
   CATEGORY:=Network
   SECTION:=net
   CATEGORY:=Network

-  MENU:=1
-  DEPENDS:=+uclibcxx
-  TITLE:=A reverse (connecting) remote shell
+  DEPENDS:=+uclibcxx +libopenssl
+  TITLE:=A reverse (connecting) remote shell (with SSL support)

   URL:=http://www.cycom.se/dl/rrs/
 endef
 
   URL:=http://www.cycom.se/dl/rrs/
 endef
 

-define Package/rrs
-  $(call Package/rrs/Default)
-  DEPENDS+=+libopenssl
-  TITLE+= (with SSL support)
-endef
-

 define Package/rrs-nossl
 define Package/rrs-nossl

-  $(call Package/rrs/Default)
-  DEPENDS+=rrs
-  TITLE+= (without SSL support)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+uclibcxx
+  TITLE:=A reverse (connecting) remote shell (without SSL support)
+  URL:=http://www.cycom.se/dl/rrs/

 endef
 
 endef
 

+

 ifneq ($(SDK),)
   CONFIG_PACKAGE_rrs:=m
   CONFIG_PACKAGE_rrs-nossl:=m
 ifneq ($(SDK),)
   CONFIG_PACKAGE_rrs:=m
   CONFIG_PACKAGE_rrs-nossl:=m


@@ -49,10 +45,13 @@ define Build/Compile/Template
                CC="$(TARGET_CC)" \
                CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -fno-rtti -nostdinc++" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic $(3) -lutil -lm -lc" \
                CC="$(TARGET_CC)" \
                CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -fno-rtti -nostdinc++" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic $(3) -lutil -lm -lc" \

+               LDFLAGSNOSSL="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic $(3) -lutil -lm -lc" \

                $(2)
        ( cd $(PKG_BUILD_DIR); mv rrs rrs-$(1); )
 endef
 
                $(2)
        ( cd $(PKG_BUILD_DIR); mv rrs rrs-$(1); )
 endef
 

+# LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic $(3) -lutil -lm -lc" \
+

 ifneq ($(CONFIG_PACKAGE_rrs),)
   define Build/Compile/with-ssl
        $(call Build/Compile/Template,ssl,generic,-lcrypto -lssl)
 ifneq ($(CONFIG_PACKAGE_rrs),)
   define Build/Compile/with-ssl
        $(call Build/Compile/Template,ssl,generic,-lcrypto -lssl)