diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2015-06-01 19:54:32 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2015-06-01 19:54:32 +0000 |
| commit | a1130bd776f241f770ec283496126d60d059dd51 (patch) | |
| tree | f02ee513913c5e79a9330ab0917e9a0a3a84b0e2 /app-text/poppler | |
| parent | Migrate SRC_URI to github. (diff) | |
| download | gentoo-2-a1130bd776f241f770ec283496126d60d059dd51.tar.gz gentoo-2-a1130bd776f241f770ec283496126d60d059dd51.tar.bz2 gentoo-2-a1130bd776f241f770ec283496126d60d059dd51.zip | |
Fix compilation with Clang
(Portage version: 2.2.14-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.33.0-r1.ebuild | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index cc51b4df4853..f228bf0890f9 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -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 <grobian@gentoo.org> poppler-0.33.0-r1.ebuild: + Fix compilation with Clang 29 May 2015; Andreas K. Hüttel <dilfridge@gentoo.org> poppler-0.33.0-r1.ebuild, poppler-9999.ebuild: diff --git a/app-text/poppler/poppler-0.33.0-r1.ebuild b/app-text/poppler/poppler-0.33.0-r1.ebuild index 2f52fecc7651..18abd4640f8f 100644 --- a/app-text/poppler/poppler-0.33.0-r1.ebuild +++ b/app-text/poppler/poppler-0.33.0-r1.ebuild @@ -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 @@ PATCHES=( "${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 |