Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7a4dcb8f9925342f0173573487f3001aaf6a7e5b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7a4dcb8f9925342f0173573487f3001aaf6a7e5b)
  • Date: Thu, 17 Aug 2017 19:58:28 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/i2pd/DETAILS | 4 ++--
net/i2pd/HISTORY | 5 +++++
net/i2pd/PRE_BUILD | 4 +---
net/i2pd/gcc46.patch | 6 +++---
4 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 7a4dcb8f9925342f0173573487f3001aaf6a7e5b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

i2pd: => 2.15.0

diff --git a/net/i2pd/DETAILS b/net/i2pd/DETAILS
index 5c56821..e38a205 100755
--- a/net/i2pd/DETAILS
+++ b/net/i2pd/DETAILS
@@ -1,8 +1,8 @@
SPELL=i2pd
- VERSION=2.14.0
+ VERSION=2.15.0
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/PurpleI2P/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:39e6cc0ed0456b93c9a7462e5630d7be87c3dda91887bef7aec50b404212f1cef02b94488ded1918eaf4264d9be5da767dab4652cf2b8470fadfa89886e42e7b
+
SOURCE_HASH=sha512:78f3b14ef7c4896528c6bd54adfcd251f3a94a0e9315924e8a9b58e3e6d0cc2c9334026d2faa9bff9da5dd3c4195e84473161ed7911c5e0155a79f456033f077
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
WEB_SITE=https://github.com/PurpleI2P/i2pd
diff --git a/net/i2pd/HISTORY b/net/i2pd/HISTORY
index 272488b..9481563 100644
--- a/net/i2pd/HISTORY
+++ b/net/i2pd/HISTORY
@@ -1,3 +1,8 @@
+2017-08-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.15.0
+ * PRE_BUILD: dropped gcc 7 fix, fixed by upstream
+ * gcc46.patch: updated
+
2017-06-02 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD: added a gcc 7.x fix

diff --git a/net/i2pd/PRE_BUILD b/net/i2pd/PRE_BUILD
index 3db1b6e..f1af7bd 100755
--- a/net/i2pd/PRE_BUILD
+++ b/net/i2pd/PRE_BUILD
@@ -7,6 +7,4 @@ if spell_ok gcc && is_version_less $(installed_version gcc)
4.7; then
if is_depends_enabled ${SPELL} miniupnpc; then
patch -p0 < "${SPELL_DIRECTORY}/gcc46_upnp.patch"
fi
-fi &&
-
-sed -i "/CXXVER/s;5-6;5-7;" Makefile.linux
+fi
diff --git a/net/i2pd/gcc46.patch b/net/i2pd/gcc46.patch
index b28d039..cad84db 100644
--- a/net/i2pd/gcc46.patch
+++ b/net/i2pd/gcc46.patch
@@ -1,12 +1,12 @@
---- Makefile.linux.orig 2016-10-17 00:37:40.000000000 -0400
-+++ Makefile.linux 2016-10-19 19:43:21.061181283 -0400
+--- Makefile.linux.orig 2017-08-17 15:44:59.293424249 -0400
++++ Makefile.linux 2017-08-17 15:46:10.575386368 -0400
@@ -18,7 +18,7 @@
else ifeq ($(shell expr match ${CXXVER} "4\.[7-9]"),3) # >= 4.7
NEEDED_CXXFLAGS += -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
else ifeq ($(shell expr match ${CXXVER} "4\.6"),3) # = 4.6
- NEEDED_CXXFLAGS += -std=c++0x
+ NEEDED_CXXFLAGS += -std=c++0x -D_GLIBCXX_USE_NANOSLEEP=1
- else ifeq ($(shell expr match ${CXXVER} "[5-6]\.[0-9]"),3) # gcc >= 5.0
+ else ifeq ($(shell expr match ${CXXVER} "[5-7]\.[0-9]"),3) # gcc >= 5.0
NEEDED_CXXFLAGS += -std=c++11
else # not supported
--- libi2pd/Tunnel.cpp.orig 2016-10-17 00:37:40.000000000 -0400



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7a4dcb8f9925342f0173573487f3001aaf6a7e5b), Vlad Glagolev, 08/18/2017

Archive powered by MHonArc 2.6.24.

Top of Page