mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 16:10:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'purple/openssl'

Browse Source
This commit is contained in:
Jeff Becker 2016-12-18 10:09:45 -05:00
commit adcf2158bf
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -10,6 +10,7 @@ DEPS := obj/make.dep
include filelist.mk include filelist.mk
USE_AESNI := yes USE_AESNI := yes
USE_AVX := yes
USE_STATIC := no USE_STATIC := no
USE_MESHNET := no USE_MESHNET := no
USE_UPNP := no USE_UPNP := no

2
Makefile.linux
View File

@ -65,7 +65,9 @@ endif
endif endif
endif endif
ifeq ($(USE_AVX),yes)
#check if AVX supported by CPU #check if AVX supported by CPU
ifneq ($(shell $(GREP) -c avx /proc/cpuinfo),0) ifneq ($(shell $(GREP) -c avx /proc/cpuinfo),0)
CPU_FLAGS += -mavx CPU_FLAGS += -mavx
endif endif
endif

10
SAM.cpp
View File

@ -622,10 +622,16 @@ namespace client
boost::asio::async_write (m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred), boost::asio::async_write (m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
std::bind (&SAMSocket::HandleWriteI2PData, shared_from_this (), std::placeholders::_1)); // postpone termination std::bind (&SAMSocket::HandleWriteI2PData, shared_from_this (), std::placeholders::_1)); // postpone termination
else else
Terminate (); {
auto s = shared_from_this ();
m_Owner.GetService ().post ([s] { s->Terminate (); });
}
} }
else else
Terminate (); {
auto s = shared_from_this ();
m_Owner.GetService ().post ([s] { s->Terminate (); });
}
} }
else else
{ {

6
debian/patches/01-tune-build-opts.patch vendored
View File

@ -1,5 +1,6 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index b6fc795..abc3ace 100644 index bdadfe0..2f71eec 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -9,10 +9,10 @@ DEPS := obj/make.dep @@ -9,10 +9,10 @@ DEPS := obj/make.dep
@ -8,9 +9,10 @@ index b6fc795..abc3ace 100644
-USE_AESNI := yes -USE_AESNI := yes
+USE_AESNI := no +USE_AESNI := no
-USE_AVX := yes
+USE_AVX := no
USE_STATIC := no USE_STATIC := no
USE_MESHNET := no USE_MESHNET := no
USE_UPNP := no USE_UPNP := no
ifeq ($(WEBSOCKETS),1) ifeq ($(WEBSOCKETS),1)
NEEDED_CXXFLAGS += -DWITH_EVENTS