remove -lgcc stuff, we use static-libgcc

10 files changed, 12 insertions, 13 deletions

diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 75872c4db..51b76cffe 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -748,6 +748,7 @@ config BUSYBOX_WALL
 
 config BUSYBOX_WATCHDOG
 	bool "watchdog"
+	default y if ADK_TARGET_WITH_WATCHDOG
 	default n
 	depends on !BUSYBOX_DISABLE_WATCHDOG
 	select BUSYBOX_PLATFORM_LINUX
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index fd7142d5f..2102b1a34 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -23,12 +23,11 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
-endif
-
+LIBRARIES:=-nodefaultlibs -luClibc++ -lm -lc
 ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp
 endif
+endif
 
 ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
 CONFIGURE_ENV+=		CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index d294570b2..ef0a20677 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -27,12 +27,11 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc
-endif
-
+LIBRARIES:=-nodefaultlibs -luClibc++ -lm -lc
 ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
+endif
 
 CONFIGURE_ARGS+=	--disable-xinerama
 
diff --git a/package/grub/Makefile b/package/grub/Makefile
index e2b86c0d8..0f4c7d3ca 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -14,6 +14,7 @@ PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://ftp.gnu.org/gnu/grub/
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips
+PKG_SYSTEM_DEPENDS:=	!mikrotik-rb532
 PKG_NOPARALLEL:=	1
 
 PKG_SUBPKGS:=		GRUB GRUB_TOOLS
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 686206153..fde09978b 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -27,7 +27,7 @@ TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ARGS+=	--enable-cxx-warnings=no
 
 ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc -lgcc
+LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc
 endif
 
 ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index a55d1b0ca..6c910592c 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -24,9 +24,9 @@ $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
 TARGET_CXXFLAGS+=	-fno-builtin -fno-rtti -nostdinc++
 TARGET_LDFLAGS+=	-nodefaultlibs
-CONFIGURE_ENV+=		LIBS="-luClibc++ -lc -lm -lgcc_s -lpthread"
+CONFIGURE_ENV+=		LIBS="-luClibc++ -lc -lm -lpthread"
 else
-CONFIGURE_ENV+=		LIBS="-lc -lm -lgcc_s -lpthread"
+CONFIGURE_ENV+=		LIBS="-lc -lm -lpthread"
 endif
 
 iperf-install:
diff --git a/package/nano/Makefile b/package/nano/Makefile
index dfe389056..59e40a65d 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		nano
 PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		03233ae480689a008eb98feb1b599807
-PKG_DESCR:=		An enhanced clone of the Pico editor
+PKG_DESCR:=		enhanced clone of the pico editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP:=		ncurses
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index c27f0ba8d..16578aca8 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -26,7 +26,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS+=		-lgcc
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 9ea77121b..361339aec 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -13,6 +13,7 @@ PKG_URL:=		http://www.denx.de/wiki/U-Boot
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_CFLINE_U_BOOT:=	depends on ADK_BROKEN
 PKG_SYSTEM_DEPENDS:=	!cubox-i
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/vim/Makefile b/package/vim/Makefile
index 1a8f2e52c..80994a8c2 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		vim
 PKG_VERSION:=		7.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		607e135c559be642f210094ad023dc65
-PKG_DESCR:=		The text editor
+PKG_DESCR:=		very popular text editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP:=		ncurses
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS+=		-lgcc
 TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ENV+=		vim_cv_toupper_broken=no \
 			vim_cv_getcwd_broken=no \