Update to latest 2017-q2 update.

 Strip PURE version, as no sources of libraries are packed to official bundle.
 It could be returned later.

4 files changed, 21 insertions, 159 deletions

diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile
index 2e968106c3c0..adcc85026803 100644
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	gcc-arm-embedded
-PORTVERSION=	6.3.20170223
+PORTVERSION=	6.3.20170628
 PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	https://developer.arm.com/-/media/Files/downloads/gnu-rm/6_1-2017q1/
+MASTER_SITES=	https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/
 DISTNAME=	${ORIGINAL_PACKAGE_NAME}-src
 
 MAINTAINER=	lev@FreeBSD.org
@@ -15,21 +15,12 @@ LICENSE_COMB=	multi
 
 BROKEN_powerpc64=	does not build: __adjust.c: internal compiler error: Segmentation fault
 
-OPTIONS_DEFINE=	PURE PYGDB EXAMPLES HTML PDF DOCS
+OPTIONS_DEFINE=	PYGDB EXAMPLES HTML PDF DOCS
 OPTIONS_DEFAULT=PYGDB
-PURE_DESC=	Use all libraries from bundle, do not depend on anything
 HTML_DESC=	Install HTML documentation
 PDF_DESC=	Install PDF documentation (requires TeX, it is huge)
 PYGDB_DESC=	Build and install pyhon-enabled gdb in addition to standard one
 
-PURE_LIB_DEPENDS_OFF=	\
-			libexpat.so:textproc/expat2 \
-			libgmp.so:math/gmp \
-			libmpfr.so:math/mpfr \
-			libmpc.so:math/mpc \
-			libisl.so:devel/isl \
-			libelf.so:devel/libelf
-
 PDF_USE=		TEX=base:build,tex:build,dvipsk:build
 PDF_BUILD_DEPENDS=	texi2dvi:print/texinfo
 PYGDB_USES=		python:2
@@ -40,6 +31,13 @@ NOT_FOR_ARCHS=		aarch64 arm armeb armv6 \
 			mips mips64 mips64el mipsel mipsn32
 NOT_FOR_ARCHS_REASON=	Very slow to build on emulator
 
+LIB_DEPENDS=		libexpat.so:textproc/expat2 \
+			libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc \
+			libisl.so:devel/isl \
+			libelf.so:devel/libelf
+
 USES=			bison compiler cpe gmake iconv makeinfo tar:bzip2
 
 GNU_CONFIGURE=	yes
@@ -48,7 +46,7 @@ PATCH_WRKSRC=	${WRKDIR}/${ORIGINAL_PACKAGE_NAME}
 BUILD_WRKSRC=	${WRKDIR}
 
 GCC_VERSION=		6.3.1
-FULL_VERSION=		6-2017-q1-update
+FULL_VERSION=		6-2017-q2-update
 TARGET=			arm-none-eabi
 ORIGINAL_PACKAGE_NAME=	gcc-${TARGET}-${FULL_VERSION}
 
@@ -73,16 +71,6 @@ BUILD_DIR=	${WRKDIR}/build
 INTERIM_WORLD=	${WRKDIR}/install
 INTERIM_PREFIX=	${INTERIM_WORLD}/${PORTNAME}-${FULL_VERSION}
 
-BUNDLED_LIBS=			EXPAT:bz2 ZLIB:gz LIBELF:gz \
-				GMP:bz2 MPFR:bz2 MPC:gz ISL:bz2
-BUNDLED_VERSION_EXPAT=		2.1.1
-BUNDLED_VERSION_ZLIB=		1.2.8
-BUNDLED_VERSION_LIBELF=		0.8.13
-BUNDLED_VERSION_GMP=		6.1.0
-BUNDLED_VERSION_MPFR=		3.1.4
-BUNDLED_VERSION_MPC=		1.0.3
-BUNDLED_VERSION_ISL=		0.15
-
 VAR_TO_SUBMAKE=	BUILD_DIR CC CFLAGS CHOSEN_COMPILER_TYPE CONFIG_SITE \
 		CONFIGURE_MAX_CMD_LEN CONFIGURE_SHELL CP CPP CPPFLAGS CXX \
 		CXXFLAGS DOCS_SUFFIX ECHO_MSG EXAMPLESDIR FILE FIND GMAKE \
@@ -96,13 +84,11 @@ VAR_TO_SUBMAKE_NOEXPAND=	CONFIGURE_ENV MAKE_ENV
 
 .include <bsd.port.pre.mk>
 
-post-extract:
 .if ${PORT_OPTIONS:MPURE}
-.for L in ${BUNDLED_LIBS}
-	@${ECHO_MSG} "====>  Extracting bundled ${L:C/[:].+//:tl}"
-	@${TAR} -xf ${SRC_DIR}/${L:C/[:].+//:tl}-${BUNDLED_VERSION_${L:C/[:].+//}}.tar.${L:C/.+[:]//} -C ${SRC_DIR}
-.endfor
+IGNORE=	"PURE option is not valid anymore, no libraries are bundled"
 .endif
+
+post-extract:
 	@${ECHO_MSG} "====>  Extracting bundled binutils"
 	@${TAR} -xf ${SRC_DIR}/binutils.tar.bz2 -C ${SRC_DIR}
 	@${ECHO_MSG} "====>  Extracting bundled gcc"
diff --git a/devel/gcc-arm-embedded/distinfo b/devel/gcc-arm-embedded/distinfo
index e598a57b1e00..0f9eb46b63f4 100644
--- a/devel/gcc-arm-embedded/distinfo
+++ b/devel/gcc-arm-embedded/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489164554
-SHA256 (gcc-arm-none-eabi-6-2017-q1-update-src.tar.bz2) = 97e34136f1bd6ded8352e0e9fd92366de51d76a9c3b60f2728b2f8c519fb49d8
-SIZE (gcc-arm-none-eabi-6-2017-q1-update-src.tar.bz2) = 193722630
+TIMESTAMP = 1499713153
+SHA256 (gcc-arm-none-eabi-6-2017-q2-update-src.tar.bz2) = da588e901c38b43cc0bd331eb81c24f70f4af946580b60c19aebf4cf9fee3e85
+SIZE (gcc-arm-none-eabi-6-2017-q2-update-src.tar.bz2) = 184939123
diff --git a/devel/gcc-arm-embedded/files/Makefile b/devel/gcc-arm-embedded/files/Makefile
index 1defaed06424..38c32e06c125 100644
--- a/devel/gcc-arm-embedded/files/Makefile
+++ b/devel/gcc-arm-embedded/files/Makefile
@@ -8,11 +8,7 @@ PKGVERSION=	GNU Tools for ARM Embedded Processors
 BUILD_PREFIX=	${WRKDIR}/build
 DOC_PREFIX=	${INTERIM_PREFIX}/${DOCS_SUFFIX}
 
-.if ${PORT_OPTIONS:MPURE}
-WORLD_LIB=${INTERIM_WORLD}
-.else
 WORLD_LIB=${LOCALBASE}
-.endif
 
 LDFLAGS+=	-L${WORLD_LIB}/lib
 
@@ -22,17 +18,7 @@ MAKE_ARGS+=     CFLAGS="-Wno-error -fbracket-depth=512" CXXFLAGS="-Wno-error -fb
 
 MISC_DOCS=	license.txt readme.txt release.txt
 
-.if ${PORT_OPTIONS:MPURE}
-PREREQUISITES=		expat \
-			zlib \
-			libelf \
-			gmp \
-			mpfr \
-			mpc \
-			isl
-.else
 PREREQUISITES=
-.endif
 
 .if ${PORT_OPTIONS:MPYGDB}
 _pygdb=		build-pygdb
@@ -74,120 +60,9 @@ ALL_BUILD=	build-binutils \
 		strip-binaries \
 		strip-target-libraries
 
-.PHONY: ${PREREQUISITES} ${ALL_BUILD}
-
-all: ${PREREQUISITES} ${ALL_BUILD}
-
-expat:
-	@${ECHO_MSG} "====>  Build expat"
-	@${RM} -rf ${BUILD_PREFIX}/expat
-	@${MKDIR} ${BUILD_PREFIX}/expat
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/expat && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/expat-${BUNDLED_VERSION_EXPAT}/configure \
-	 --prefix=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/expat all ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/expat install ${MAKE_ARGS}
-
-zlib:
-	@${ECHO_MSG} "====>  Build zlib"
-	@${RM} -rf ${BUILD_PREFIX}/zlib
-	@${MKDIR} ${BUILD_PREFIX}/zlib
-	@${ECHO_MSG} "=====>  Copy to build dir"
-	@${TAR} -cf - -C ${SRC_DIR}/zlib-${BUNDLED_VERSION_ZLIB} . | ${TAR} -xf - -C ${BUILD_PREFIX}/zlib
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/zlib && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ./configure \
-	 --static \
-	 --prefix=${INTERIM_WORLD}
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/zlib ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/zlib install ${MAKE_ARGS}
-
-libelf:
-	@${ECHO_MSG} "====>  Build libelf"
-	@${RM} -rf ${BUILD_PREFIX}/libelf
-	@${MKDIR} ${BUILD_PREFIX}/libelf
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/libelf && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/libelf-${BUNDLED_VERSION_LIBELF}/configure \
-	 --prefix=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/libelf all ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/libelf install ${MAKE_ARGS}
-
-gmp:
-	@${ECHO_MSG} "====>  Build gmp"
-	@${RM} -rf ${BUILD_PREFIX}/gmp
-	@${MKDIR} ${BUILD_PREFIX}/gmp
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/gmp && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/gmp-${BUNDLED_VERSION_GMP}/configure \
-	 --prefix=${INTERIM_WORLD} \
-	 --enable-cxx \
-	 --disable-shared \
-	 --disable-nls
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gmp all ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gmp install ${MAKE_ARGS}
-
-mpfr:
-	@${ECHO_MSG} "====>  Build mpfr"
-	@${RM} -rf ${BUILD_PREFIX}/mpfr
-	@${MKDIR} ${BUILD_PREFIX}/mpfr
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/mpfr && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpfr-${BUNDLED_VERSION_MPFR}/configure \
-	 --prefix=${INTERIM_WORLD} \
-	 --with-gmp=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/mpfr all ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/mpfr install ${MAKE_ARGS}
+.PHONY: ${ALL_BUILD}
 
-mpc:
-	@${ECHO_MSG} "====>  Build mpc"
-	@${RM} -rf ${BUILD_PREFIX}/mpc
-	@${MKDIR} ${BUILD_PREFIX}/mpc
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/mpc && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpc-${BUNDLED_VERSION_MPC}/configure \
-	 --prefix=${INTERIM_WORLD} \
-	 --with-gmp=${INTERIM_WORLD} \
-	 --with-mpfr=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/mpc all ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/mpc install ${MAKE_ARGS}
-
-isl:
-	@${ECHO_MSG} "====>  Build isl"
-	@${RM} -rf ${BUILD_PREFIX}/isl
-	@${MKDIR} ${BUILD_PREFIX}/isl
-	@${ECHO_MSG} "=====>  Configure"
-	@cd ${BUILD_PREFIX}/isl && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/isl-${BUNDLED_VERSION_ISL}/configure \
-	 --prefix=${INTERIM_WORLD} \
-	 --with-gmp-prefix=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
-	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/isl all ${MAKE_ARGS}
-	@${ECHO_MSG} "=====>  Install into intermediate directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/isl install ${MAKE_ARGS}
+all: ${ALL_BUILD}
 
 build-binutils:
 	@${ECHO_MSG} "====>  Build binutils"
diff --git a/devel/gcc-arm-embedded/pkg-plist b/devel/gcc-arm-embedded/pkg-plist
index c2445fbe0b0c..adba882fbd85 100644
--- a/devel/gcc-arm-embedded/pkg-plist
+++ b/devel/gcc-arm-embedded/pkg-plist
@@ -1269,7 +1269,6 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/string.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/strings.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/_default_fcntl.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/_intsup.h
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/_locale.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/_pthreadtypes.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/_sigset.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/_stdint.h
@@ -1319,6 +1318,7 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/utmp.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/wchar.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/wctype.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/wordexp.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/xlocale.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/aprofile-validation.specs
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/aprofile-ve.specs
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/cpu-init/rdimon-aem.o
@@ -2056,6 +2056,7 @@ gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gcc-ar
 gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gcc-nm
 gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gcc-ranlib
 gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gcov
+gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gcov-dump
 gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gcov-tool
 gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gdb
 gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gprof