summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-06 15:10:10 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-06 15:10:10 +0200
commit0c4255f9860dec3c7f0ecf32454bd93268879278 (patch)
tree10b95030218fbec1bd253413a0cb980c8f593646
parent8d277912e2312f01c3eb892b7333b78628ca7ad4 (diff)
static-libgcc for base package dropbear
-rw-r--r--package/dropbear/patches/patch-Makefile_in21
1 files changed, 19 insertions, 2 deletions
diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in
index 0995ed95a..3e6783b64 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-06-02 21:00:17.000000000 +0200
++++ dropbear-2012.55/Makefile.in 2012-10-05 17:24:16.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
@@ -21,7 +21,16 @@
LDFLAGS=@LDFLAGS@
EXEEXT=@EXEEXT@
-@@ -169,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile
+@@ -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
# multi-binary compilation.
MULTIOBJS=
ifeq ($(MULTI),1)
@@ -30,3 +39,11 @@
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))
+