From 8d2f8e89c7b4ed479c72000e54bc23621e665699 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2013 09:03:48 +0200 Subject: musl libc compat updates --- package/dropbear/Makefile | 5 ++++- package/dropbear/patches/patch-Makefile_in | 27 ++++++--------------------- package/dropbear/patches/patch-cli-runopts_c | 10 +++++----- package/dropbear/patches/patch-options_h | 4 ++-- 4 files changed, 17 insertions(+), 29 deletions(-) (limited to 'package/dropbear') diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index a16c69965..65fe397e4 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -26,7 +26,10 @@ 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) +TARGET_LDFLAGS+= $(ADK_TARGET_ABI_CFLAGS) -static +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/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in index 3e6783b64..890900ee5 100644 --- a/package/dropbear/patches/patch-Makefile_in +++ b/package/dropbear/patches/patch-Makefile_in @@ -1,5 +1,5 @@ ---- dropbear-2012.55.orig/Makefile.in 2012-02-23 14:47:05.000000000 +0100 -+++ dropbear-2012.55/Makefile.in 2012-10-05 17:24:16.000000000 +0200 +--- dropbear-2013.58.orig/Makefile.in 2013-04-18 16:58:14.000000000 +0200 ++++ dropbear-2013.58/Makefile.in 2013-08-13 14:33:37.000000000 +0200 @@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ listener.h fake-rfc2553.h @@ -9,28 +9,21 @@ dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) -@@ -75,9 +75,8 @@ AR=@AR@ +@@ -75,10 +75,9 @@ AR=@AR@ RANLIB=@RANLIB@ STRIP=@STRIP@ INSTALL=@INSTALL@ -CPPFLAGS=@CPPFLAGS@ -CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ -LIBS+=@LIBS@ +-LDFLAGS=@LDFLAGS@ +CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) +LIBS+=@LIBS@ @CRYPTLIB@ - LDFLAGS=@LDFLAGS@ ++LDFLAGS+=@LDFLAGS@ EXEEXT=@EXEEXT@ -@@ -159,7 +158,7 @@ dropbearkey: $(dropbearkeyobjs) - dropbearconvert: $(dropbearconvertobjs) - dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile -- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) -+ $(CC) $(LDFLAGS) -static-libgcc -o $@$(EXEEXT) $($@objs) $(LIBS) - - # scp doesn't use the libs so is special. - scp: $(SCPOBJS) $(HEADERS) Makefile -@@ -169,14 +168,14 @@ scp: $(SCPOBJS) $(HEADERS) Makefile +@@ -169,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile # multi-binary compilation. MULTIOBJS= ifeq ($(MULTI),1) @@ -39,11 +32,3 @@ CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI endif - dropbearmulti: multilink - - multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile -- $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -static-libgcc -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) - - multilink: multibinary $(addprefix link, $(PROGRAMS)) - diff --git a/package/dropbear/patches/patch-cli-runopts_c b/package/dropbear/patches/patch-cli-runopts_c index b2f98da81..5a8297b87 100644 --- a/package/dropbear/patches/patch-cli-runopts_c +++ b/package/dropbear/patches/patch-cli-runopts_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.53.1.orig/cli-runopts.c 2011-03-02 14:23:35.000000000 +0100 -+++ dropbear-0.53.1/cli-runopts.c 2011-08-02 20:03:12.000000000 +0200 -@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) +--- dropbear-2013.58.orig/cli-runopts.c 2013-04-18 16:58:14.000000000 +0200 ++++ dropbear-2013.58/cli-runopts.c 2013-08-13 14:29:15.000000000 +0200 +@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -11,8 +11,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ + break; case 'F': case 'e': - case 'c': -@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv) + #ifndef ENABLE_USER_ALGO_LIST +@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv) #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index 68a8b2a1b..88a081624 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,7 +1,7 @@ diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h --- dropbear-2013.58.orig/options.h 2013-04-18 16:58:14.000000000 +0200 -+++ dropbear-2013.58/options.h 2013-04-29 14:28:47.000000000 +0200 -@@ -247,7 +247,7 @@ ++++ dropbear-2013.58/options.h 2013-08-13 14:29:15.000000000 +0200 +@@ -247,7 +247,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND -- cgit v1.2.3 From f9ac2c3112cedf7d1f155847825297543205e9e2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb 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') 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 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') 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