summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-06-08 12:17:09 +0000
committerFabian Groffen <grobian@gentoo.org>2010-06-08 12:17:09 +0000
commit5703d802b732720dd24048e8aaaa60880062263c (patch)
treec75712ed02e4461cef26c29d046087d6adbb77ab /app-text
parentQt release version bump (diff)
downloadgentoo-2-5703d802b732720dd24048e8aaaa60880062263c.tar.gz
gentoo-2-5703d802b732720dd24048e8aaaa60880062263c.tar.bz2
gentoo-2-5703d802b732720dd24048e8aaaa60880062263c.zip
Don't define _XOPEN_SOURCE on Solaris either, such that we can compile there too.
(Portage version: 2.2.00.15842-prefix/cvs/SunOS i386)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/poppler/ChangeLog6
-rw-r--r--app-text/poppler/poppler-0.12.4-r3.ebuild9
2 files changed, 9 insertions, 6 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 705979b9c8bf..cce6c70314dd 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/poppler
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.232 2010/05/19 20:38:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.233 2010/06/08 12:17:08 grobian Exp $
+
+ 08 Jun 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4-r3.ebuild:
+ Don't define _XOPEN_SOURCE on Solaris either, such that we can compile
+ there too.
19 May 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4-r3.ebuild:
Fixed compilation on Darwin 8 (OSX 10.4) by not defining _XOPEN_SOURCE at
diff --git a/app-text/poppler/poppler-0.12.4-r3.ebuild b/app-text/poppler/poppler-0.12.4-r3.ebuild
index f6b6a5dfff30..c42738830572 100644
--- a/app-text/poppler/poppler-0.12.4-r3.ebuild
+++ b/app-text/poppler/poppler-0.12.4-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.4 2010/05/19 20:39:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.5 2010/06/08 12:17:09 grobian Exp $
EAPI="2"
@@ -59,10 +59,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
- # The whole _XOPEN_SOURCE thing breaks Tiger (kinda sad they dished
- # configure, since it typically is good at knowing this), I need to take
- # this upstream still, configure and cmake conflict in this regard.
- [[ ${CHOST} == *-darwin8 ]] && \
+ # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, I need to
+ # take this upstream still, configure and cmake conflict in this regard.
+ [[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \
sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
}