From f9ac2c3112cedf7d1f155847825297543205e9e2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 14 Aug 2013 11:40:58 +0200
Subject: only build static when choosen by the user

---
 package/dropbear/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'package/dropbear/Makefile')

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 65fe397e4..c38977f1d 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -26,7 +26,12 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	$(ADK_TARGET_ABI_CFLAGS) -static
+TARGET_LDFLAGS+=	$(ADK_TARGET_ABI_CFLAGS)
+
+ifeq ($(ADK_STATIC),y)
+TARGET_LDFLAGS+=	-static
+endif
+
 ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
 TARGET_LDFLAGS+=	-static-libgcc
 endif
-- 
cgit v1.2.3


From 76ca709e69bf386a9e011fae588fe3f5d09b834c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 14 Aug 2013 12:11:20 +0200
Subject: prepare the base system without libgcc even for musl

---
 package/busybox/Makefile      | 6 +-----
 package/cfgfs/Makefile        | 3 ---
 package/dropbear/Makefile     | 2 --
 package/musl/Config.in.manual | 1 -
 target/config/Config.in       | 7 -------
 5 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'package/dropbear/Makefile')

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index e95c58045..b9476be3e 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -38,11 +38,7 @@ BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
 			HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
 			-C ${WRKBUILD} 
 ifneq (${ADK_NATIVE},y)
-ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),)
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
-else
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)"
-endif
+BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS="-static-libgcc"
 else
 BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
 endif
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 3e53f845c..159bd229b 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -26,10 +26,7 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-
-ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
 TARGET_LDFLAGS+=	-static-libgcc
-endif
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CFGFS}/sbin
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index c38977f1d..69eb5ff5d 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -32,9 +32,7 @@ ifeq ($(ADK_STATIC),y)
 TARGET_LDFLAGS+=	-static
 endif
 
-ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
 TARGET_LDFLAGS+=	-static-libgcc
-endif
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 CONFIGURE_ARGS+=	--disable-pam \
diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual
index a3881c1e8..19f590e61 100644
--- a/package/musl/Config.in.manual
+++ b/package/musl/Config.in.manual
@@ -4,7 +4,6 @@ config ADK_PACKAGE_MUSL
 	default y if ADK_TARGET_LIB_MUSL && !ADK_TOOLCHAIN_ONLY
 	default n
 	depends on ADK_TARGET_LIB_MUSL
-	select ADK_PACKAGE_LIBGCC
 	help
 	  Embedded C library.
 
diff --git a/target/config/Config.in b/target/config/Config.in
index 3865147a7..84ea8fe68 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -564,9 +564,6 @@ config ADK_musl
 config ADK_libc
 	boolean
 
-config ADK_TARGET_LIB_STATIC_LIBGCC
-	boolean
-
 config ADK_TARGET_LIBC
 	string
 	default "uclibc"  if ADK_uclibc
@@ -584,7 +581,6 @@ config ADK_TARGET_LIB_UCLIBC
 	prompt "uClibc embedded C library"
 	boolean
 	select ADK_uclibc
-	select ADK_TARGET_LIB_STATIC_LIBGCC
 	depends on \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
@@ -597,7 +593,6 @@ config ADK_TARGET_LIB_EGLIBC
 	prompt "Embedded GNU C library"
 	boolean
 	select ADK_eglibc
-	select ADK_TARGET_LIB_STATIC_LIBGCC
 	depends on \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_ARMEB || \
@@ -618,7 +613,6 @@ config ADK_TARGET_LIB_GLIBC
 	prompt "GNU C library"
 	boolean
 	select ADK_glibc
-	select ADK_TARGET_LIB_STATIC_LIBGCC
 	depends on \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_ARMEB || \
@@ -654,7 +648,6 @@ config ADK_TARGET_LIB_LIBC
 	prompt "Native C library"
 	boolean
 	select ADK_libc
-	select ADK_TARGET_LIB_STATIC_LIBGCC
 	depends on ADK_LINUX_NATIVE
 
 endchoice
-- 
cgit v1.2.3