This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapbox-variant.
commit d3f331a7db50c7c0b4cd112c5fa04851902878d4
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Jan 18 21:02:52 2017 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/disble-mason.patch | 31 ++++++++++++-------------------
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c2766e..8452eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mapbox-variant (1.1.5-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches.
-- Bas Couwenberg <sebas...@debian.org> Wed, 18 Jan 2017 20:58:10 +0100
diff --git a/debian/patches/disble-mason.patch
b/debian/patches/disble-mason.patch
index c4021bc..31297fc 100644
--- a/debian/patches/disble-mason.patch
+++ b/debian/patches/disble-mason.patch
@@ -4,32 +4,25 @@ Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
-@@ -4,7 +4,7 @@ BOOST_VERSION = boost 1.60.0
- CXX := $(CXX)
+@@ -5,7 +5,7 @@ CXX := $(CXX)
CXX_STD ?= c++11
--BOOST_FLAGS = `$(MASON) cflags $(BOOST_VERSION)`
+ BOOST_ROOT = $(shell $(MASON) prefix boost $(BOOST_VERSION))
+-BOOST_FLAGS = -isystem $(BOOST_ROOT)/include/
+BOOST_FLAGS =
- RELEASE_FLAGS = -O3 -DNDEBUG -march=native -DSINGLE_THREADED
-fvisibility-inlines-hidden
- DEBUG_FLAGS = -O0 -g -DDEBUG -fno-inline-functions
- COMMON_FLAGS = -Wall -pedantic -Wextra -Wsign-compare -Wsign-conversion
-Wshadow -Wunused-parameter -std=$(CXX_STD)
-@@ -16,8 +16,8 @@ ALL_HEADERS = $(shell find include/mapbo
+ RELEASE_FLAGS = -O3 -DNDEBUG -march=native -DSINGLE_THREADED
-fvisibility-inlines-hidden -fvisibility=hidden
+ DEBUG_FLAGS = -O0 -g -DDEBUG -fno-inline-functions -fno-omit-frame-pointer
-fPIE
+ WARNING_FLAGS = -Werror -Wall -Wextra -pedantic \
+@@ -44,10 +44,10 @@ ALL_HEADERS = $(shell find include/mapbo
all: out/bench-variant out/unique_ptr_test out/unique_ptr_test
out/recursive_wrapper_test out/binary_visitor_test out/lambda_overload_test
out/hashable_test
- mason_packages:
+ $(MASON):
- git submodule update --init .mason
-- $(MASON) install $(BOOST_VERSION)
+# git submodule update --init .mason
-+# $(MASON) install $(BOOST_VERSION)
+
+ mason_packages/headers/boost: $(MASON)
+- $(MASON) install boost $(BOOST_VERSION)
++# $(MASON) install boost $(BOOST_VERSION)
./deps/gyp:
git clone --depth 1 https://chromium.googlesource.com/external/gyp.git
./deps/gyp
-@@ -83,7 +83,7 @@ coverage:
- sizes: Makefile
- mkdir -p ./out
- @$(CXX) -o ./out/our_variant_hello_world.out include/mapbox/variant.hpp
-I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h
./out/our_variant_hello_world.out
-- @$(CXX) -o ./out/boost_variant_hello_world.out `$(MASON) prefix boost
1.60.0`/include/boost/variant.hpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS)
$(CXXFLAGS) $(BOOST_FLAGS) && du -h ./out/boost_variant_hello_world.out
-+ @$(CXX) -o ./out/boost_variant_hello_world.out
/usr/include/boost/variant.hpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS)
$(CXXFLAGS) $(BOOST_FLAGS) && du -h ./out/boost_variant_hello_world.out
- @$(CXX) -o ./out/our_variant_hello_world
./test/our_variant_hello_world.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS)
$(CXXFLAGS) && du -h ./out/our_variant_hello_world
- @$(CXX) -o ./out/boost_variant_hello_world
./test/boost_variant_hello_world.cpp -I./include $(RELEASE_FLAGS)
$(COMMON_FLAGS) $(CXXFLAGS) $(BOOST_FLAGS) && du -h
./out/boost_variant_hello_world
-
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mapbox-variant.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
