grobian 15/06/01 19:54:32 Modified: poppler-0.33.0-r1.ebuild ChangeLog Log: Fix compilation with Clang (Portage version: 2.2.14-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.4 app-text/poppler/poppler-0.33.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?r1=1.3&r2=1.4 Index: poppler-0.33.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- poppler-0.33.0-r1.ebuild 29 May 2015 13:00:45 -0000 1.3 +++ poppler-0.33.0-r1.ebuild 1 Jun 2015 19:54:32 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.3 2015/05/29 13:00:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.4 2015/06/01 19:54:32 grobian Exp $ EAPI=5 @@ -66,6 +66,16 @@ "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" ) +src_prepare() { + cmake-utils_src_prepare + + # Clang doesn't grok this flag, the configure nicely tests that, but + # cmake just uses it, so remove it if we use clang + if [[ ${CC} == clang ]] ; then + sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die + fi +} + src_configure() { local mycmakeargs=( -DBUILD_GTK_TESTS=OFF 1.462 app-text/poppler/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.462&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.462&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.461&r2=1.462 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v retrieving revision 1.461 retrieving revision 1.462 diff -u -r1.461 -r1.462 --- ChangeLog 29 May 2015 13:00:45 -0000 1.461 +++ ChangeLog 1 Jun 2015 19:54:32 -0000 1.462 @@ -1,6 +1,9 @@ # ChangeLog for app-text/poppler # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.461 2015/05/29 13:00:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.462 2015/06/01 19:54:32 grobian Exp $ + + 01 Jun 2015; Fabian Groffen <[email protected]> poppler-0.33.0-r1.ebuild: + Fix compilation with Clang 29 May 2015; Andreas K. Hüttel <[email protected]> poppler-0.33.0-r1.ebuild, poppler-9999.ebuild:
