Browse Source

static-libgcc for base package dropbear

Waldemar Brodkorb 12 years ago
parent
commit
0c4255f986
1 changed files with 19 additions and 2 deletions
  1. 19 2
      package/dropbear/patches/patch-Makefile_in

+ 19 - 2
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))
+