From 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 14 Sep 2010 19:04:46 +0200
Subject: replace mksh scripts with faster C programs

depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced
by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes,
so that a package is rebuild.

Generation of meta-data is a lot faster now.

Fix or add new PKG variables to fulfill the needs of the new programs.
Documentation will follow as soon as it is stable.
---
 package/rrs/Makefile | 53 +++++++---------------------------------------------
 1 file changed, 7 insertions(+), 46 deletions(-)

(limited to 'package/rrs/Makefile')

diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index cd5144daf..ba32293f0 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -9,68 +9,29 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		b400d03c0e39e3e78a7327ba78f789f0
 PKG_DESCR:=		A reverse (connecting) remote shell, with SSL support.
 PKG_SECTION:=		net/misc
-PKG_CXX:=		RRS
-PKG_BUILDDEP+=		zlib
-ifneq ($(ADK_PACKAGE_RRS),)
-PKG_BUILDDEP+=		openssl
-endif
-PKG_URL:=		http://www.cycom.se/dl/rrs
+PKG_DEPENDS:=		zlib libopenssl
+PKG_BUILDDEP:=		zlib openssl
+PKG_URL:=		http://www.cycom.se/dl/rrs/
 PKG_SITES:=		http://www.cycom.se/uploads/36/19/
-
-PKG_DEPENDS:=		libopenssl zlib
-PKG_DEPENDS_NOSSL:=	zlib
-
-ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
-PKG_DEPENDS_NOSSL+=	uclibc++
-else
-PKG_DEPENDS_NOSSL+=	libstdcxx
-endif
+PKG_CXX:=		RRS
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RRS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
-BUILD_STYLE:=          manual
+BUILD_STYLE:=		manual
 INSTALL_STYLE:=         manual
 
-ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
-PKG_FLAGS=-fno-builtin -fno-rtti -nostdinc++ -fPIC
-PKG_LDFLAGS=-nodefaultlibs -luClibc++ -lc -lm
-else
-PKG_FLAGS=-fPIC
-PKG_LDFLAGS=-shared
-endif
-
 do-build:
-ifneq (${ADK_PACKAGE_RRS},)
 	${MAKE} -C ${WRKBUILD} \
 		CC="${TARGET_CC}" \
 		CFLAGS="${TARGET_CFLAGS} -I${STAGING_DIR}/usr/include ${PKG_FLAGS}" \
 		LDFLAGS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz" \
 		generic
-	{ cd ${WRKBUILD}; mv rrs rrs-ssl; }
-	-${MAKE} -C ${WRKBUILD} \
-		clean
-endif
-ifneq (${ADK_PACKAGE_RRS_NOSSL},)
-	${MAKE} -C ${WRKBUILD} \
-		CC="${TARGET_CC}" \
-		CFLAGS="${TARGET_CFLAGS} -I${STAGING_DIR}/usr/include ${PKG_FLAGS}" \
-		LDFLAGSNOSSL="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil" \
-		generic-nossl
-	{ cd ${WRKBUILD}; mv rrs rrs-nossl; }
-endif
 
 do-install:
-ifneq (${ADK_PACKAGE_RRS},)
 	${INSTALL_DIR} ${IDIR_RRS}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/rrs-ssl ${IDIR_RRS}/usr/bin/rrs
-endif
-ifneq (${ADK_PACKAGE_RRS_NOSSL},)
-	${INSTALL_DIR} ${IDIR_RRS_NOSSL}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/rrs-nossl ${IDIR_RRS_NOSSL}/usr/bin/rrs
-endif
+	${INSTALL_BIN} ${WRKBUILD}/rrs ${IDIR_RRS}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3