Control: tags -1 + patch

Hi,

Michael Crusoe a écrit le 04/10/2019 à 16:01 :
> Attached is a patch to force gcc 8; so far it has gotten farther than
> the previous failure for me (but my local build is still at 86%)

Looking at the related lines of /usr/include/c++/9/bits/stl_function.h,
it seems that __builtin_is_constant_evaluated is used only for C++
standard greater or equal to c++14:
> #if __cplusplus >= 201402L
> #ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
>       if (__builtin_is_constant_evaluated())
> #else
>       if (__builtin_constant_p(__x > __y))
> #endif
>         return __x > __y;
> #endif
>       return (__UINTPTR_TYPE__)__x > (__UINTPTR_TYPE__)__y;


Then I tried using '-std=c++11' and the build was successful.

Patch attached.

Thanks,

_g.
diff -Nru insighttoolkit4-4.12.2-dfsg1/debian/changelog 
insighttoolkit4-4.12.2-dfsg1/debian/changelog
--- insighttoolkit4-4.12.2-dfsg1/debian/changelog       2018-08-28 
16:27:47.000000000 +0200
+++ insighttoolkit4-4.12.2-dfsg1/debian/changelog       2019-10-07 
21:50:28.000000000 +0200
@@ -1,3 +1,10 @@
+insighttoolkit4 (4.12.2-dfsg1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Force -std=c++11 to fix FTBFS with GCC-9 (closes: #935086)
+
+ -- Gilles Filippini <p...@debian.org>  Mon, 07 Oct 2019 21:50:28 +0200
+
 insighttoolkit4 (4.12.2-dfsg1-4) unstable; urgency=medium
 
   * d/rules: Remove build dir right after installation
diff -Nru insighttoolkit4-4.12.2-dfsg1/debian/rules 
insighttoolkit4-4.12.2-dfsg1/debian/rules
--- insighttoolkit4-4.12.2-dfsg1/debian/rules   2018-08-28 16:27:47.000000000 
+0200
+++ insighttoolkit4-4.12.2-dfsg1/debian/rules   2019-10-07 21:50:28.000000000 
+0200
@@ -25,6 +25,9 @@
   ENABLE_UNSIGNED_LONG=ON 
 endif 
 
+# Fix for #935086
+export DEB_CXXFLAGS_MAINT_APPEND+=-std=c++11
+
 CMAKE_FLAGS = \
        -DBUILD_EXAMPLES:BOOL=ON \
        -DBUILD_SHARED_LIBS:BOOL=ON \

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to