diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 08:48:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 08:48:27 +0100 |
| commit | f5a8c46a5e05beadcbd2e7e2ff486974e39059fd (patch) | |
| tree | 9d8a7ce0c657c69281fe5e57fc3d317eedf5879f /package/dropbear/patches/patch-Makefile_in | |
| parent | 16fb2268394f00ab27e3582d02e03b6f5abbc72e (diff) | |
| parent | bcd5e4c0b934296bc8f63cf03495a49158812bde (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dropbear/patches/patch-Makefile_in')
| -rw-r--r-- | package/dropbear/patches/patch-Makefile_in | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in index 890900ee5..3a139a546 100644 --- a/package/dropbear/patches/patch-Makefile_in +++ b/package/dropbear/patches/patch-Makefile_in @@ -1,15 +1,6 @@ ---- 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 - --dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ -+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) - dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) - dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) - dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) -@@ -75,10 +75,9 @@ AR=@AR@ +--- dropbear-2014.63.orig/Makefile.in 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/Makefile.in 2014-03-01 18:27:41.000000000 +0100 +@@ -81,10 +81,10 @@ AR=@AR@ RANLIB=@RANLIB@ STRIP=@STRIP@ INSTALL=@INSTALL@ @@ -20,15 +11,25 @@ +CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) +LIBS+=@LIBS@ @CRYPTLIB@ +LDFLAGS+=@LDFLAGS@ ++ EXEEXT=@EXEEXT@ -@@ -169,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile - # multi-binary compilation. - MULTIOBJS= - ifeq ($(MULTI),1) -- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ -+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) - CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI +@@ -163,7 +163,7 @@ dropbearkey: $(dropbearkeyobjs) + dropbearconvert: $(dropbearconvertobjs) + + dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile +- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ ++ $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) + + dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile + $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) +@@ -184,7 +184,7 @@ ifeq ($(MULTI),1) endif + dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile +- $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ ++ $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) + + multibinary: dropbearmulti$(EXEEXT) + |