Bug#946116: FTBFS with CGAL 5.0

[Joachim Reichel]

Source: rheolef
Version: 7.0-3
Severity: serious
Tags: ftbfs
Control: block 944417 by -1

Hi,

the transition to CGAL 5.0 started (see bug #944417) and your package FTBFS.
Attached are two patches to fix the problem, however, the build fails at a
later stage due to bug #944197.

Best regards,
  Joachim
-------------- next part --------------
Index: rheolef-7.0/configure.ac
===================================================================
--- rheolef-7.0.orig/configure.ac
+++ rheolef-7.0/configure.ac
@@ -600,29 +600,10 @@ dnl is it a well-known C++ compiler ?
 dnl-------------------------------------------------------------------------
 RHEO_RECOGNIZE_CXX
 if test x"${rheo_cxx}" = x"gnu"; then
-    RHEO_GXX2011
-    if test x"${rheo_gxx2011}" = x"yes"; then
-      if test x"${rheo_have_float128}" = x"yes"; then
-        CXXFLAGS="${CXXFLAGS} -std=gnu++11"
-      else
-        CXXFLAGS="${CXXFLAGS} -std=c++11"
-      fi
-    else
-      RHEO_GXX2011_PRE
-      if test x"${rheo_gxx2011_pre}" = x"yes"; then
-        if test x"${rheo_have_float128}" = x"yes"; then
-          CXXFLAGS="${CXXFLAGS} -std=gnu++0x"
-        else
-          CXXFLAGS="${CXXFLAGS} -std=c++0x"
-        fi
-      else
-        CXXFLAGS="${CXXFLAGS} -ansi"
-      fi
-    fi
-    CXXFLAGS="${CXXFLAGS} -Wall ${permissive_opts} -Wno-unused -Wno-strict-aliasing -Wno-literal-suffix -Wno-deprecated-declarations"
+    CXXFLAGS="${CXXFLAGS} -Wall ${permissive_opts} -Wno-unused -Wno-strict-aliasing -Wno-literal-suffix -Wno-deprecated-declarations -std=c++14"
     LDFLAGS="${LDFLAGS} -Wl,--as-needed"
 elif test x"${rheo_cxx}" = x"clang"; then
-    CXXFLAGS="${CXXFLAGS} -Wall ${permissive_opts} -Wno-unused -Wno-strict-aliasing -Wno-deprecated-declarations -Wno-deprecated-register -std=c++11"
+    CXXFLAGS="${CXXFLAGS} -Wall ${permissive_opts} -Wno-unused -Wno-strict-aliasing -Wno-deprecated-declarations -Wno-deprecated-register -std=c++14"
     LDFLAGS="${LDFLAGS} -Wl,--as-needed"
 fi
 #echo "CXXFLAGS ${CXXFLAGS}"
-------------- next part --------------
Index: rheolef-7.0/configure.ac
===================================================================
--- rheolef-7.0.orig/configure.ac
+++ rheolef-7.0/configure.ac
@@ -1726,7 +1726,7 @@ with_cgal="yes"
 rheo_incdir_cgal=""
 rheo_libdir_cgal=""
 #rheo_libs_cgal="-lCGAL_Core -lCGAL -lboost_thread"
-rheo_libs_cgal="-lCGAL -lgmp"
+rheo_libs_cgal="-lgmp"
 AC_ARG_WITH(cgal-incdir,
     [  --with-cgal-incdir[[=DIR]]      the cgal computational geometry includes directory (default=autodetect) ],
     [  case "${withval}" in
@@ -1752,7 +1752,7 @@ AC_ARG_WITH(cgal-libdir,
     [  rheo_libdir_cgal="" ]
 )
 AC_ARG_WITH(cgal-libs,
-    [  --with-cgal-libs[[=LIBS]]       the cgal computational geometry library linker flags (default=-lCGAL) ],
+    [  --with-cgal-libs[[=LIBS]]       the cgal computational geometry library linker flags (default=-lgmp) ],
     [  case "${withval}" in
           yes|no)  with_cgal=${withval};;
           *)       rheo_libs_cgal=${withval}