more gcc 4.4 issues on mips

- disable runit in busybox
- update gmp to latest upstream
- PKG_DEPEND -> PKG_DEPENDS

8 files changed, 32 insertions, 36 deletions

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index b8894d4c5..91cf58e81 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -599,7 +599,8 @@ source package/busybox/config/networking/Config.in
 source package/busybox/config/printutils/Config.in
 source package/busybox/config/mailutils/Config.in
 source package/busybox/config/procps/Config.in
-source package/busybox/config/runit/Config.in
+# disable, gcc 4.4.0 problems
+#source package/busybox/config/runit/Config.in
 source package/busybox/config/selinux/Config.in
 source package/busybox/config/shell/Config.in
 source package/busybox/config/sysklogd/Config.in
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index c9cf60739..7fb1bea5b 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -11,20 +11,22 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		6635e2d0d0ee21faeb85d95cd93c137b
 MASTER_SITES:=		http://www.rahul.net/dholmes/ctorrent/
 WRKDIST=		${WRKDIR}/${PKG_NAME}-dnh2
+
 ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-PKG_DEPEND:=            uclibc++
+PKG_DEPENDS:=            uclibc++
 else
-PKG_DEPEND:=            libstdcxx
+PKG_DEPENDS:=            libstdcxx
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
+$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
 
 ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
 TLDFLAGS+=		-lgcc_s -luClibc++ -lc -lm -nodefaultlibs
 endif
+
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index d2cb4fe34..fb735f368 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -4,14 +4,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		gmp
-PKG_VERSION:=		4.2.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		7ce52531644e6d12f16911b7e3151f3f
-MASTER_SITES:=		${MASTER_SITE_GNU:=gmp/}
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
+include ${TOPDIR}/toolchain/gmp/Makefile.inc
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE}))
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index edd6d222b..8e0a9cb23 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -11,16 +11,16 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		19f27ddd2dda4b2d26a559a4f0f402a7
 MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
-PKG_DEPEND:=		zlib libiconv
+PKG_DEPENDS:=		zlib libiconv
 ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
-PKG_DEPEND+=		uclibc++
+PKG_DEPENDS+=		uclibc++
 else
-PKG_DEPEND+=		libstdcxx
+PKG_DEPENDS+=		libstdcxx
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
+$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-cxx-warnings=no
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 053347a76..5a3a998bc 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -12,16 +12,16 @@ PKG_MD5SUM:=		278dd2e849cc3dbb947df961a1aaffd0
 MASTER_SITES:=		http://download.insecure.org/nmap/dist/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-PKG_DEPEND:=		libgcc libdnet libpcap libpcre
+PKG_DEPENDS:=		libgcc libdnet libpcap libpcre
 ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
-PKG_DEPEND+=		uclibc++
+PKG_DEPENDS+=		uclibc++
 else
-PKG_DEPEND+=		libstdcxx
+PKG_DEPENDS+=		libstdcxx
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
+$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
 
 TCPPFLAGS+=		-DNOLUA
 ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
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} \
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 96a820fcf..be239b5b7 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -9,16 +9,15 @@ PKG_NAME:=		weechat
 PKG_VERSION:=		0.1.8
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		73d6bc211ac32c597f0d278506480a20
-
 MASTER_SITES:=		http://weechat.flashtux.org/download/
 
 include ${TOPDIR}/mk/package.mk
 
-PKG_DEPEND:=		libncurses libiconv
+PKG_DEPENDS:=		libncurses libiconv
 
 ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
 ENABLE_TLS:=		--with-libgnutls-prefix=${STAGING_DIR}/usr
-PKG_DEPEND+=		gnutls
+PKG_DEPENDS+=		gnutls
 else
 ENABLE_TLS:=		--disable-gnutls
 endif
@@ -26,10 +25,10 @@ endif
 ifneq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
 DISABLE_LUA:=		--disable-lua
 else
-PKG_DEPEND+=		liblua
+PKG_DEPENDS+=		liblua
 endif
 
-$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
+$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	${ENABLE_TLS} \
diff --git a/toolchain/gmp/Makefile.inc b/toolchain/gmp/Makefile.inc
index f0db3fb5b..aa3994e1b 100644
--- a/toolchain/gmp/Makefile.inc
+++ b/toolchain/gmp/Makefile.inc
@@ -4,9 +4,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gmp
-PKG_VERSION:=		4.2.2
+PKG_VERSION:=		4.3.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7ce52531644e6d12f16911b7e3151f3f
+PKG_MD5SUM:=		26cec15a90885042dd4a15c4003b08ae
 MASTER_SITES:=		${MASTER_SITE_GNU:=gmp/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 GMP_BUILD_DIR:=		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)