avr-gcc: Disable ISL

There are still C++ version mismatch problems with "inplace" ISL.
Forcing C++ version (to C++14) no longer works.

Author: Michael Baeuerle

avr-gcc/Makefile

@@ -18,10 +18,8 @@ DEPENDS+=		avr-binutils>=2.42:../../cross/avr-binutils
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_LANGUAGES=			c c++
-USE_CXX_FEATURES+=		c++14
-# Required for ISL with option "gcc-inplace-math"
-FORCE_CXX_STD=			c++14
+USE_LANGUAGES=		c c++
+USE_CXX_FEATURES+=	c++14
 
 USE_LIBTOOL=			yes
 USE_TOOLS+=			bash gmake gsed:run perl
@@ -45,6 +43,8 @@ CONFIGURE_ARGS+=	--disable-lto
 CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ARGS+=	--target=avr
 CONFIGURE_ARGS+=	--with-system-zlib
+# XXX: Disabled because of C++ version mismatch problems
+CONFIGURE_ARGS+=	--without-isl
 
 # XXX: Workaround for configure error:
 #    checking dependency style of c++... none

avr-gcc/options.mk

@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=
 # gcc-inplace-math: Build math libraries in place
 .if !empty(PKG_OPTIONS:Mgcc-inplace-math)
 .  include "../../devel/gmp/inplace.mk"
-.  include "../../math/isl/inplace.mk"
+#.  include "../../math/isl/inplace.mk"
 .  include "../../math/mpcomplex/inplace.mk"
 .  include "../../math/mpfr/inplace.mk"
 .else
@@ -19,8 +19,8 @@ CONFIGURE_ARGS+=	--with-mpc=${BUILDLINK_PREFIX.mpcomplex}
 CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.3.2
 .  include "../../devel/gmp/buildlink3.mk"
-BUILDLINK_API_DEPENDS.isl+=		isl>=0.15
-.  include "../../math/isl/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.isl+=		isl>=0.15
+#.  include "../../math/isl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.mpcomplex+=	mpcomplex>=1.0.1
 .  include "../../math/mpcomplex/buildlink3.mk"
 BUILDLINK_API_DEPENDS.mpfr+=		mpfr>=3.1.0