From 272811a75268efef3f1cb96bedd9cbaf21a41d2e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 8 Apr 2017 08:52:40 +0200 Subject: [PATCH] Add some files I forgot in the patchset. --- net-misc/mosh/patches/mosh-1.3.0.patchset | 55 ++++++++++++++++++++++- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/net-misc/mosh/patches/mosh-1.3.0.patchset b/net-misc/mosh/patches/mosh-1.3.0.patchset index 8443c35c7..32c510477 100644 --- a/net-misc/mosh/patches/mosh-1.3.0.patchset +++ b/net-misc/mosh/patches/mosh-1.3.0.patchset @@ -1,4 +1,4 @@ -From dbd5bd9882bf5bfe29c3ab371bdef898827a69e0 Mon Sep 17 00:00:00 2001 +From c7dea12b7bccb6c96f02c37d3cf3aab755b8014a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 26 Oct 2014 22:05:31 +0100 Subject: Fix build on Haiku. @@ -31,11 +31,62 @@ index a0857d3..f500a1f 100644 ]) AC_MSG_CHECKING([whether pipe2(..., O_CLOEXEC) is supported]) +diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am +index faa2286..a8c664f 100644 +--- a/src/examples/Makefile.am ++++ b/src/examples/Makefile.am +@@ -15,16 +15,16 @@ decrypt_LDADD = ../crypto/libmoshcrypto.a $(CRYPTO_LIBS) + + parse_SOURCES = parse.cc + parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util +-parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a $(LIBUTIL) ++parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a + + termemu_SOURCES = termemu.cc + termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs +-termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a $(LIBUTIL) $(TINFO_LIBS) $(protobuf_LIBS) ++termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a $(TINFO_LIBS) $(protobuf_LIBS) + + ntester_SOURCES = ntester.cc + ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(protobuf_CFLAGS) +-ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a ../util/libmoshutil.a $(LIBUTIL) -lm $(protobuf_LIBS) $(CRYPTO_LIBS) ++ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a ../util/libmoshutil.a -lm $(protobuf_LIBS) $(CRYPTO_LIBS) + + benchmark_SOURCES = benchmark.cc + benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto -I$(srcdir)/../network $(protobuf_CFLAGS) +-benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) $(LIBUTIL) -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) ++benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) +diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am +index 5856469..a9d4188 100644 +--- a/src/frontend/Makefile.am ++++ b/src/frontend/Makefile.am +@@ -3,7 +3,7 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXF + AM_LDFLAGS = $(HARDEN_LDFLAGS) + LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) + +-mosh_server_LDADD = $(LDADD) $(LIBUTIL) ++mosh_server_LDADD = $(LDADD) + + bin_PROGRAMS = + +diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am +index 45446ac..a6f9fe6 100644 +--- a/src/tests/Makefile.am ++++ b/src/tests/Makefile.am +@@ -63,7 +63,7 @@ nonce_incr_LDADD = ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util + + inpty_SOURCES = inpty.cc + inpty_CPPFLAGS = -I$(srcdir)/../util +-inpty_LDADD = ../util/libmoshutil.a $(LIBUTIL) ++inpty_LDADD = ../util/libmoshutil.a + + clean-local: clean-local-check + .PHONY: clean-local-check -- 2.12.2 -From ebc890544cb943ecf7045d4dfd99bc8f5131a9f7 Mon Sep 17 00:00:00 2001 +From 036cbcfae56421c98dc6d32da38682eb86c2efe3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 8 Apr 2017 08:46:27 +0200 Subject: Fix tests on Haiku