From 8e09105ecbddd319a54dccaaf1e9f277bc44dfb4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 24 May 2009 22:14:13 +0200 Subject: more gcc 4.4 issues on mips - disable runit in busybox - update gmp to latest upstream - PKG_DEPEND -> PKG_DEPENDS --- package/rrs/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'package/rrs/Makefile') diff --git a/package/rrs/Makefile b/package/rrs/Makefile index 54b461961..9ecf6adcf 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -10,20 +10,22 @@ PKG_VERSION:= 1.70 PKG_RELEASE:= 2 PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0 MASTER_SITES:= http://www.cycom.se/uploads/36/19/ -PKG_DEPEND:= libopenssl zlib -PKG_DEPEND_NOSSL:= zlib + +PKG_DEPENDS:= libopenssl zlib +PKG_DEPENDS_NOSSL:= zlib + ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) -PKG_DEPEND+= uclibc++ -PKG_DEPEND_NOSSL+= uclibc++ +PKG_DEPENDS+= uclibc++ +PKG_DEPENDS_NOSSL+= uclibc++ else -PKG_DEPEND+= libstdcxx -PKG_DEPEND_NOSSL+= libstdcxx +PKG_DEPENDS+= libstdcxx +PKG_DEPENDS_NOSSL+= libstdcxx endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND})) -$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND_NOSSL})) +$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL})) ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y) PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++ @@ -33,7 +35,6 @@ PKG_CFLAGS= PKG_LDFLAGS=-shared endif - do-configure: ifneq (${ADK_PACKAGE_RRS},) ${MAKE} -C ${WRKBUILD} \ -- cgit v1.2.3