Date: Sat, 28 Nov 2015 13:37:47 +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: r402530 - in head/audio/libkcompactdisc: . files Message-ID: <201511281337.tASDblBi069862@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Nov 28 13:37:47 2015 New Revision: 402530 URL: https://svnweb.freebsd.org/changeset/ports/402530 Log: Add upstream patch to fix the build with clang + ALSA option. Extend the compiler check so that the code is built with -std=c99, which is required by the ALSA headers. Bump PORTREVISION because this also changes the build flags for GCC users. PR: 204858 MFH: 2015Q4 Added: head/audio/libkcompactdisc/files/patch-git_d6927712 (contents, props changed) Modified: head/audio/libkcompactdisc/Makefile Modified: head/audio/libkcompactdisc/Makefile ============================================================================== --- head/audio/libkcompactdisc/Makefile Sat Nov 28 13:08:48 2015 (r402529) +++ head/audio/libkcompactdisc/Makefile Sat Nov 28 13:37:47 2015 (r402530) @@ -3,6 +3,7 @@ PORTNAME= libkcompactdisc PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= audio kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Added: head/audio/libkcompactdisc/files/patch-git_d6927712 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libkcompactdisc/files/patch-git_d6927712 Sat Nov 28 13:37:47 2015 (r402530) @@ -0,0 +1,33 @@ +Makes the port build with clang when the ALSA option is on. + +commit d69277128afb60999e420c533e826b0061fc40eb +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Sat Nov 28 14:27:45 2015 +0100 + + Extend -std=c99 compiler flag to clang. + + The ALSA headers use features such as the `inline' keyword that require + C99 support. Commit e36c628 ("Fix compilation: ALSA no longer compiles + with -std=c90") started passing it to the compiler when GCC is used. + + We now do the same for clang with a better comment, and also append the + flag to the existing CMAKE_C_FLAGS, otherwise we lose several other + options which are set by FindKDE4Internal.cmake. + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -7,9 +7,12 @@ include(MacroLibrary) + add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) + + ## Compiler flags +-if(CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_C_FLAGS "-std=c99") ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077 ++if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++ # ALSA does not build with the default -std=iso9899:1990 from FindKDE4Internal.cmake. ++ # See https://bugzilla.novell.com/show_bug.cgi?id=817077 for more information. ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") + endif() ++ + find_package(Alsa) + alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511281337.tASDblBi069862>