diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 12:02:33 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 12:02:33 +0100 |
commit | b3259201a158cb1a571c2a3b2976fbd7b95a4b80 (patch) | |
tree | d1bf8edcf012880df29e52bf326b96c18c624dab /package/rrs | |
parent | 0c0ed379d9f34a2d085d9ebf7accf63d48684439 (diff) | |
parent | 537a2c4eaa446e52c6ba07007eb9ae75998b5580 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/rrs')
-rw-r--r-- | package/rrs/Config.in | 46 | ||||
-rw-r--r-- | package/rrs/Makefile | 7 |
2 files changed, 5 insertions, 48 deletions
diff --git a/package/rrs/Config.in b/package/rrs/Config.in deleted file mode 100644 index 482911e33..000000000 --- a/package/rrs/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -config ADK_COMPILE_RRS - tristate - default n - depends on ADK_PACKAGE_RRS || ADK_PACKAGE_RRS_NOSSL - -config ADK_PACKAGE_RRS - prompt "rrs............................... A reverse (connecting) remote shell, with SSL support" - tristate - default n - select ADK_COMPILE_RRS - select ADK_PACKAGE_ZLIB - select ADK_PACKAGE_LIBOPENSSL - help - A reverse (connecting) remote shell, built with SSL support. - - http://www.cycom.se/dl/rrs/ - -config ADK_PACKAGE_RRS_NOSSL - prompt "rrs-nossl......................... A reverse (connecting) remote shell, without SSL support" - tristate - default n - select ADK_COMPILE_RRS - select ADK_PACKAGE_ZLIB - help - A reverse (connecting) remote shell, built without SSL support. - - http://www.cycom.se/dl/rrs/ - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_RRS -default ADK_COMPILE_RRS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_RRS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_RRS_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_RRS_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice - diff --git a/package/rrs/Makefile b/package/rrs/Makefile index fe16bdd2c..6f45be506 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -6,6 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrs PKG_VERSION:= 1.70 PKG_RELEASE:= 2 +PKG_BUILDDEP+= zlib +PKG_CXX:= RRS +ifneq ($(ADK_PACKAGE_RRS),) +PKG_BUILDDEP+= openssl +endif PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0 PKG_DESCR:= A reverse (connecting) remote shell, with SSL support. PKG_SECTION:= net @@ -16,10 +21,8 @@ PKG_DEPENDS:= libopenssl zlib PKG_DEPENDS_NOSSL:= zlib ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ PKG_DEPENDS_NOSSL+= uclibc++ else -PKG_DEPENDS+= libstdcxx PKG_DEPENDS_NOSSL+= libstdcxx endif |