Date: Wed, 6 Nov 2013 12:40:12 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332984 - in head/devel/kdevelop-pg-qt: . files Message-ID: <201311061240.rA6CeCLY070739@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Nov 6 12:40:11 2013 New Revision: 332984 URL: http://svnweb.freebsd.org/changeset/ports/332984 Log: - Support staging. [1] - Fix a crash while building devel/kdevelop-php on FreeBSD 10 and HEAD by replacing USE_GCC=yes with USES=compiler:c++11-lib and importing some upstream commits related to improving clang support. Curiously enough, we did not have problems building this port with clang before per se. However, forcing GCC even on systems that use libc++ by default was causing crashes at runtime (ie. the ones that happened while building devel/kdevelop-php), probably due to STL mismatch issues. On the other hand, simply using USES=compiler:c++11-lib is not enough, as GCC only allows the use of the <unordered_set> header in C++11 mode, so the upstream patches are also needed. Bump PORTREVISION due to the change in the build dependencies. Submitted by: Schaich Alonso <alonsoschaich@fastmail.fm> [1] Added: head/devel/kdevelop-pg-qt/files/patch-git_f32988db..5209a043 (contents, props changed) Modified: head/devel/kdevelop-pg-qt/Makefile Modified: head/devel/kdevelop-pg-qt/Makefile ============================================================================== --- head/devel/kdevelop-pg-qt/Makefile Wed Nov 6 12:39:44 2013 (r332983) +++ head/devel/kdevelop-pg-qt/Makefile Wed Nov 6 12:40:11 2013 (r332984) @@ -3,7 +3,7 @@ PORTNAME= kdevelop PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/src @@ -18,9 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${P USE_GCC= yes USE_BZIP2= yes -USES= bison cmake:outsource +USES= bison cmake:outsource compiler:c++11-lib USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= qmake_build moc_build uic_build rcc_build -NO_STAGE= yes .include <bsd.port.mk> Added: head/devel/kdevelop-pg-qt/files/patch-git_f32988db..5209a043 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kdevelop-pg-qt/files/patch-git_f32988db..5209a043 Wed Nov 6 12:40:11 2013 (r332984) @@ -0,0 +1,31 @@ +commit f32988dbaefcad34ab7966676058629e73c438fd +Author: Milian Wolff <mail@milianw.de> +Date: Sun Aug 4 21:37:01 2013 +0200 + + Fix compile with clang, also enable exceptions there. + +commit 5209a0439006c1ceac6e25fe583a8f1e068af0b8 +Author: Sven Brauch <svenbrauch@googlemail.com> +Date: Sun Sep 8 01:24:00 2013 +0200 + + -std=c++11 -> -std=c++0x to fix build on build.kde.org + + still builds with gcc 4.8 + +diff --git a/kdev-pg/CMakeLists.txt b/kdev-pg/CMakeLists.txt +index 7022121..57eb03b 100644 +--- kdev-pg/CMakeLists.txt ++++ kdev-pg/CMakeLists.txt +@@ -4,9 +4,9 @@ PROJECT(kdevpg) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + REMOVE_DEFINITIONS(-DQT_NO_STL) + ADD_DEFINITIONS(-DQT_STL) +-if(CMAKE_COMPILER_IS_GNUCC) +- add_definitions(-fexceptions) +-endif(CMAKE_COMPILER_IS_GNUCC) ++if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER_ID MATCHES Clang) ++ add_definitions(-fexceptions -std=c++0x) ++endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER_ID MATCHES Clang) + + QT4_ADD_RESOURCES(kdevpg_rcc_srcs ../unidata.qrc) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311061240.rA6CeCLY070739>