[med-svn] [libmems] 01/09: Add boost.m4 patch to patchset
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Aug 17 10:05:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository libmems.
commit 347e5b587dc5c23e0cf6311748fe537f6fb620db
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Mon Aug 17 10:38:43 2015 +0200
Add boost.m4 patch to patchset
---
.../patches/03_update_boost_m4_to_git_d9ff75.patch | 191 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 192 insertions(+)
diff --git a/debian/patches/03_update_boost_m4_to_git_d9ff75.patch b/debian/patches/03_update_boost_m4_to_git_d9ff75.patch
new file mode 100644
index 0000000..a89ac25
--- /dev/null
+++ b/debian/patches/03_update_boost_m4_to_git_d9ff75.patch
@@ -0,0 +1,191 @@
+Description: Updates the boost.m4 file to correct problems with gcc-5
+ This patch updates the m4/boost.m4 file to the git version d9ff75
+ of boost.m4 upstream
+ .
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+Origin: other, https://github.com/tsuna/boost.m4
+Bug-Debian: https://bugs.debian.org/795344
+Forwarded: no
+Last-Update: 2015-08-17
+
+--- libmems-1.6.0+4725.orig/m4/boost.m4
++++ libmems-1.6.0+4725/m4/boost.m4
+@@ -22,7 +22,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ m4_define([_BOOST_SERIAL], [m4_translit([
+-# serial 23
++# serial 24
+ ], [#
+ ], [])])
+
+@@ -72,8 +72,25 @@ dnl strip `\n' with backquotes, not the
+ dnl boost_cv_lib_version='1_37\r' for instance, which breaks
+ dnl everything else.
+ dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
++dnl
++dnl Beware that GCC 5, when expanding macros, may embed # line directives
++dnl a within single line:
++dnl
++dnl # 1 "conftest.cc"
++dnl # 1 "<built-in>"
++dnl # 1 "<command-line>"
++dnl # 1 "conftest.cc"
++dnl # 1 "/opt/local/include/boost/version.hpp" 1 3
++dnl # 2 "conftest.cc" 2
++dnl boost-lib-version =
++dnl # 2 "conftest.cc" 3
++dnl "1_56"
++dnl
++dnl So get rid of the # lines, and glue the remaining ones together.
+ (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
++ grep -v '#' |
+ tr -d '\r' |
++ tr -s '\n' ' ' |
+ $SED -n -e "$1" >conftest.i 2>&1],
+ [$3],
+ [$4])
+@@ -208,7 +225,7 @@ AC_LANG_POP([C++])dnl
+ AC_CACHE_CHECK([for Boost's header version],
+ [boost_cv_lib_version],
+ [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
+- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}],
++ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
+ [#include <boost/version.hpp>
+ boost-lib-version = BOOST_LIB_VERSION],
+ [boost_cv_lib_version=`cat conftest.i`])])
+@@ -216,7 +233,7 @@ boost-lib-version = BOOST_LIB_VERSION],
+ boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+ case $boost_major_version in #(
+ '' | *[[!0-9]]*)
+- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
++ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
+ ;;
+ esac
+ fi
+@@ -557,13 +574,40 @@ BOOST_FIND_LIB([chrono], [$1],
+ [boost/chrono.hpp],
+ [boost::chrono::thread_clock d;])
+ if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
+- BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
++ BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS"
+ fi
+ LIBS=$boost_filesystem_save_LIBS
+ LDFLAGS=$boost_filesystem_save_LDFLAGS
+ ])# BOOST_CHRONO
+
+
++# BOOST_CONTEXT([PREFERRED-RT-OPT])
++# -----------------------------------
++# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the
++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
++# 1.51.0
++BOOST_DEFUN([Context],
++[BOOST_FIND_LIB([context], [$1],
++ [boost/context/all.hpp],[[
++// creates a stack
++void * stack_pointer = new void*[4096];
++std::size_t const size = sizeof(void*[4096]);
++
++// context fc uses f() as context function
++// fcontext_t is placed on top of context stack
++// a pointer to fcontext_t is returned
++fc = ctx::make_fcontext(stack_pointer, size, f);
++return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl
++namespace ctx = boost::context;
++// context
++static ctx::fcontext_t fcm, *fc;
++// context-function
++static void f(intptr_t i) {
++ ctx::jump_fcontext(fc, &fcm, i * 2);
++}])
++])# BOOST_CONTEXT
++
++
+ # BOOST_CONVERSION()
+ # ------------------
+ # Look for Boost.Conversion (cast / lexical_cast)
+@@ -573,6 +617,44 @@ BOOST_FIND_HEADER([boost/lexical_cast.hp
+ ])# BOOST_CONVERSION
+
+
++# BOOST_COROUTINE([PREFERRED-RT-OPT])
++# -----------------------------------
++# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the
++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
++# 1.53.0
++BOOST_DEFUN([Coroutine],
++[
++boost_coroutine_save_LIBS=$LIBS
++boost_coroutine_save_LDFLAGS=$LDFLAGS
++# Link-time dependency from coroutine to context
++BOOST_CONTEXT([$1])
++# Starting from Boost 1.55 a dependency on Boost.System is added
++if test $boost_major_version -ge 155; then
++ BOOST_SYSTEM([$1])
++fi
++m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)])
++LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS"
++LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS"
++
++BOOST_FIND_LIB([coroutine], [$1],
++ [boost/coroutine/coroutine.hpp],
++ [boost::coroutines::coroutine< int(int) > coro; coro.empty();])
++
++# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54
++# coroutine doesn't use context from its headers but from its library.
++if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then
++ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS"
++ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS"
++fi
++if test $enable_static_boost = yes && test $boost_major_version -ge 155; then
++ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS"
++ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS"
++fi
++LIBS=$boost_coroutine_save_LIBS
++LDFLAGS=$boost_coroutine_save_LDFLAGS
++])# BOOST_COROUTINE
++
++
+ # BOOST_CRC()
+ # -----------
+ # Look for Boost.CRC
+@@ -699,6 +781,15 @@ BOOST_DEFUN([Lambda],
+ [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
+
+
++# BOOST_LOCALE()
++# --------------
++# Look for Boost.Locale
++BOOST_DEFUN([Locale],
++[BOOST_FIND_LIB([locale], [$1],
++ [boost/locale.hpp],
++ [[boost::locale::generator gen; std::locale::global(gen(""));]])
++])# BOOST_LOCALE
++
+ # BOOST_LOG([PREFERRED-RT-OPT])
+ # -----------------------------
+ # Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
+@@ -794,6 +885,12 @@ BOOST_DEFUN([Preprocessor],
+ [BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
+
+
++# BOOST_RANGE()
++# --------------------
++# Look for Boost.Range
++BOOST_DEFUN([Range],
++[BOOST_FIND_HEADER([boost/range/adaptors.hpp])])
++
+ # BOOST_UNORDERED()
+ # -----------------
+ # Look for Boost.Unordered
+@@ -1199,6 +1296,8 @@ if test x$boost_cv_inc_path != xno; then
+ # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
+ # the same defines as GCC's).
+ for i in \
++ _BOOST_mingw_test(5, 0) \
++ _BOOST_gcc_test(5, 0) \
+ _BOOST_mingw_test(4, 10) \
+ _BOOST_gcc_test(4, 10) \
+ _BOOST_mingw_test(4, 9) \
diff --git a/debian/patches/series b/debian/patches/series
index 5de2526..dde51c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_fix_ctors.patch
02_fix_a_Wformat.patch
pkg-config-directive.patch
+03_update_boost_m4_to_git_d9ff75.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libmems.git
More information about the debian-med-commit
mailing list