Switch back to using base gcc with the stack protector disabled
for arm. This requires miod's patch to disable the stack protector
for libstdc++ on arm I just committed to src.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- Makefile 28 Jan 2016 11:28:02 -0000 1.141
+++ Makefile 18 Feb 2016 03:30:24 -0000
@@ -6,7 +6,7 @@ COMMENT = portable build system
VER = 3.4.3
DISTNAME = cmake-${VER}
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
HOMEPAGE = http://www.cmake.org/
@@ -20,12 +20,6 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += archive c curl expat form jsoncpp m ncurses pthread stdc++ z
-# XXX: On arm libstdc++ from base (and especially iostream) seems
-# to be broken, so use g++ from ports.
-MODULES = gcc4
-MODGCC4_ARCHS = arm
-MODGCC4_LANGS = c++
-
# XXX: Ninja is broken on m88k
.if ${MACHINE_ARCH} != "m88k"
BUILD_DEPENDS = devel/ninja>=1.5.1
@@ -49,6 +43,10 @@ CONFIGURE_ARGS = --prefix=${PREFIX} \
--sphinx-man \
--system-libs \
--verbose
+
+.if ${MACHINE_ARCH} == "arm"
+CXXFLAGS+=-fno-stack-protector
+.endif
CONFIGURE_ENV += MAKE=${MAKE_PROGRAM}
