From 5b040233c8d15004f88e0228fa167eb27ff3ee66 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 27 Nov 2016 20:14:07 +0000 Subject: Work around USES=compiler:gcc-c++11-lib on 10.1 after r426565 __cxa_throw_bad_array_new_length as used by GCC 4.9+ appeared in libcxxrt since 10.2. For 10.1 or earlier limit to GCC 4.8. PR: 214863 Approved by: portmgr (???) --- Mk/Uses/compiler.mk | 4 ++++ audio/csound6/Makefile | 2 +- audio/gbsplay/Makefile | 1 + cad/kicad/Makefile | 2 +- cad/openvsp/Makefile | 1 + comms/sdr-wspr/Makefile | 1 + emulators/pipelight/Makefile | 2 +- graphics/GraphicsMagick/Makefile | 7 ++----- graphics/qgis/Makefile | 1 + graphics/shotwell/Makefile | 1 + graphics/vigra/Makefile | 2 +- math/ceres-solver/Makefile | 1 + math/octave-forge-parallel/Makefile | 1 + math/saga/Makefile | 2 +- multimedia/bombono/Makefile | 2 +- net/mediatomb/Makefile | 2 +- print/lilypond-devel/Makefile | 1 + science/gnudatalanguage/Makefile | 2 +- 18 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 94bf2ee..2a5c2ca 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -238,7 +238,11 @@ CXX= ${LOCALBASE}/bin/clang++34 .endif .if ${_COMPILER_ARGS:Mgcc-c++11-lib} +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001508 +USE_GCC= 4.8 +.else USE_GCC= yes +.endif CHOSEN_COMPILER_TYPE= gcc .if ${COMPILER_FEATURES:Mlibc++} LDFLAGS+= -L${LOCALBASE}/lib/c++ diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile index 248862b..9982859 100644 --- a/audio/csound6/Makefile +++ b/audio/csound6/Makefile @@ -3,7 +3,7 @@ PORTNAME= csound PORTVERSION= 6.06 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} PKGNAMESUFFIX= 6 diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile index 45e7f2c..311c7d7 100644 --- a/audio/gbsplay/Makefile +++ b/audio/gbsplay/Makefile @@ -3,6 +3,7 @@ PORTNAME= gbsplay PORTVERSION= 0.0.93 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 4db11b9..28e74af 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -3,7 +3,7 @@ PORTNAME= kicad DISTVERSION= 20140622%2Bbzr4027 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= https://launchpadlibrarian.net/179199115/ diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 271871a..8f6c590 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -3,6 +3,7 @@ PORTNAME= openvsp PORTVERSION= 3.9.1 +PORTREVISION= 1 DISTVERSIONPREFIX= ${GH_PROJECT}_ CATEGORIES= cad diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile index e7888c5..5942e57 100644 --- a/comms/sdr-wspr/Makefile +++ b/comms/sdr-wspr/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdr-wspr PORTVERSION= 0.1.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= comms hamradio diff --git a/emulators/pipelight/Makefile b/emulators/pipelight/Makefile index 3af9084..fbe0000 100644 --- a/emulators/pipelight/Makefile +++ b/emulators/pipelight/Makefile @@ -3,7 +3,7 @@ PORTNAME= pipelight PORTVERSION= 0.2.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://bitbucket.org/mmueller2012/pipelight/get/ \ http://repos.fds-team.de/pluginloader/v${DISTVERSION}/:plg diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 186654a..f31384b 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -3,6 +3,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.25 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF \ @@ -50,7 +51,7 @@ LCMS2_CONFIGURE= lcms2 LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 OPENMP_CONFIGURE_OFF= --disable-openmp --without-threads OPENMP_CONFIGURE_ON= --disable-openmp-slow --enable-openmp --with-threads -OPENMP_USES= compiler:openmp +OPENMP_USES= compiler:gcc-c++11-lib PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:graphics/png Q8BIT_CONFIGURE_OFF= --with-quantum-depth=16 @@ -98,7 +99,3 @@ post-install-Q8BIT-on: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q8/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q8/filters .include - -# The OPENMP option may select gcc as compiler but on architectures -# that have switched to libc++ clang should be used for C++ code. -CXX= c++ diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 37ef37b..207a6a6 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -4,6 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 2_14_3 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 57a5e84..908bc87 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -3,6 +3,7 @@ PORTNAME= shotwell PORTVERSION= 0.24.2 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R} diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index ebcd46b..4b56df8 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -3,7 +3,7 @@ PORTNAME= vigra DISTVERSION= 1.11.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 07c96a6..82a1bfd 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -2,6 +2,7 @@ PORTNAME= ceres-solver DISTVERSION= 1.12.0rc4 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile index 4dfb231..bf146ca 100644 --- a/math/octave-forge-parallel/Makefile +++ b/math/octave-forge-parallel/Makefile @@ -3,6 +3,7 @@ PORTNAME= octave-forge-parallel PORTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/saga/Makefile b/math/saga/Makefile index 12b71f5..633a172 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index 61c15cb..7d33e60 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -3,7 +3,7 @@ PORTNAME= bombono PORTVERSION= 1.2.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R} DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index 7672b4d..cc7f5a9 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -3,7 +3,7 @@ PORTNAME= mediatomb PORTVERSION= 0.12.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net multimedia MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION} diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 081f7d6..dd964b1 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= lilypond PORTVERSION= 2.19.51 +PORTREVISION= 1 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ PKGNAMESUFFIX= -devel diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 7d681a5..4db6a85 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.6v2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION:R} .if defined(BUILD_PYTHON_MODULE)