summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-09 18:54:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-09 18:54:05 +0000
commitc4528d1d7e798ac9ee91f7f67ded6f7a2e5470c3 (patch)
treeb6f027fa1aa79834dd8a44ed29cddf04c7538922 /x11-misc/gmrun
parentStable for HPPA (bug #280470). (diff)
downloadgentoo-2-c4528d1d7e798ac9ee91f7f67ded6f7a2e5470c3.tar.gz
gentoo-2-c4528d1d7e798ac9ee91f7f67ded6f7a2e5470c3.tar.bz2
gentoo-2-c4528d1d7e798ac9ee91f7f67ded6f7a2e5470c3.zip
Apply glibc patch only if >= 2.10 since it's not backward compatible.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/gmrun')
-rw-r--r--x11-misc/gmrun/ChangeLog5
-rw-r--r--x11-misc/gmrun/gmrun-0.9.2.ebuild11
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-misc/gmrun/ChangeLog b/x11-misc/gmrun/ChangeLog
index 574d0a5164ca..9123823d0ebf 100644
--- a/x11-misc/gmrun/ChangeLog
+++ b/x11-misc/gmrun/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/gmrun
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.18 2009/07/25 07:21:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.19 2009/08/09 18:54:05 ssuominen Exp $
+
+ 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> gmrun-0.9.2.ebuild:
+ Apply glibc patch only if >= 2.10 since it's not backward compatible.
25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> gmrun-0.9.2.ebuild,
+files/gmrun-0.9.2-glibc210.patch:
diff --git a/x11-misc/gmrun/gmrun-0.9.2.ebuild b/x11-misc/gmrun/gmrun-0.9.2.ebuild
index 5cdf38f344a9..5848e9b597e9 100644
--- a/x11-misc/gmrun/gmrun-0.9.2.ebuild
+++ b/x11-misc/gmrun/gmrun-0.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2.ebuild,v 1.16 2009/07/25 07:21:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2.ebuild,v 1.17 2009/08/09 18:54:05 ssuominen Exp $
EAPI=2
inherit autotools eutils
@@ -21,8 +21,13 @@ DEPEND="${RDEPEND}
sys-apps/sed"
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-glibc210.patch
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+
+ # ugly but it's not backwards compatible
+ if has_version ">=sys-libs/glibc-2.10"; then
+ epatch "${FILESDIR}"/${P}-glibc210.patch
+ fi
+
# Disable check for STLport due to bug #164339
sed -i -e 's,^AC_PATH_STLPORT,dnl REMOVED ,g' configure.in
sed -i -e 's,@STLPORT_[A-Z]\+@,,g' src/Makefile.am