[mapbox-variant] 07/08: Add patch to disable mason, not required for Debian package build.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapbox-variant.

commit e9e66298cf90ee4aced587d29517e5207346f51d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 18 21:35:20 2016 +0200

    Add patch to disable mason, not required for Debian package build.
---
 debian/changelog                  |  1 +
 debian/patches/disble-mason.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5f626ae..e180b34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapbox-variant (1.1.1-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8, no changes.
   * Update copyright file, update path for recursive_wrapper.hpp.
   * Update paths in install file.
+  * Add patch to disable mason, not required for Debian package build.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 18 Jul 2016 18:14:34 +0200
 
diff --git a/debian/patches/disble-mason.patch b/debian/patches/disble-mason.patch
new file mode 100644
index 0000000..09222a5
--- /dev/null
+++ b/debian/patches/disble-mason.patch
@@ -0,0 +1,35 @@
+Description: Disbale mason, not required for Debian package build.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ BOOST_VERSION = boost 1.60.0
+ CXX := $(CXX)
+ CXX_STD ?= c++11
+ 
+-BOOST_FLAGS = `$(MASON) cflags $(BOOST_VERSION)`
++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
+ all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
+ 
+ mason_packages:
+-	git submodule update --init .mason
+-	$(MASON) install $(BOOST_VERSION)
++#	git submodule update --init .mason
++#	$(MASON) install $(BOOST_VERSION)
+ 
+ ./deps/gyp:
+ 	git clone --depth 1 https://chromium.googlesource.com/external/gyp.git ./deps/gyp
+@@ -75,7 +75,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
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5445292
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disble-mason.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapbox-variant.git