[pybind11] 02/07: merge patched into master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository pybind11.

commit 62a7aefde6a7476d280f19c20d0b7f058781df98
Merge: 94b2580 3477f64
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Feb 10 16:24:58 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...emporary-fix-for-the-gcc-6-LTO-regression.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/CMakeLists.txt                               |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index bd2bb09,0000000..3cbfca3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- c2010fb61826c45bdd0ee6f36c17d7bf84d8daaf
- c2010fb61826c45bdd0ee6f36c17d7bf84d8daaf
++3477f64b6fc33b30e49c85f8f23997ef5efb61ba
++3477f64b6fc33b30e49c85f8f23997ef5efb61ba
 +72d57df80676e2965c20128f76f00d4ae6fd696d
 +72d57df80676e2965c20128f76f00d4ae6fd696d
 +pybind11_2.0.1.orig.tar.gz
 +e558565968cd385d9fad73c18362a46f70eea8aa
 +398236
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Temporary-fix-for-the-gcc-6-LTO-regression.patch
index 0000000,0000000..fb72c7e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Temporary-fix-for-the-gcc-6-LTO-regression.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 3477f64b6fc33b30e49c85f8f23997ef5efb61ba Mon Sep 17 00:00:00 2001
++From: Jason Rhinelander <jason at imaginary.ca>
++Date: Fri, 10 Feb 2017 16:21:34 +0000
++Subject: Temporary fix for the gcc-6 LTO regression
++
++---
++ tests/CMakeLists.txt | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
++index 763ad54..870866e 100644
++--- a/tests/CMakeLists.txt
+++++ b/tests/CMakeLists.txt
++@@ -65,7 +65,7 @@ if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
++ endif()
++ 
++ # Create the binding library
++-pybind11_add_module(pybind11_tests pybind11_tests.cpp
+++pybind11_add_module(pybind11_tests NO_EXTRAS pybind11_tests.cpp
++   ${PYBIND11_TEST_FILES} ${PYBIND11_HEADERS})
++ 
++ pybind11_enable_warnings(pybind11_tests)
diff --cc debian/patches/series
index 5bcb53a,0000000..9b09112
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-system-include-path.patch
++0002-Temporary-fix-for-the-gcc-6-LTO-regression.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybind11.git