Gentoo Archives: gentoo-commits

From: "Patrick Lauer (patrick)" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/IcePy/files: IcePy-3.2.1-python-2.6.diff
Date: Thu, 10 Sep 2009 00:32:36
Message-Id: E1MlXaR-0005Uw-Cz@stork.gentoo.org
1 patrick 09/09/10 00:32:31
2
3 Added: IcePy-3.2.1-python-2.6.diff
4 Log:
5 Fixing py 2.6 and 2.7 detection. Fixes #280075, Patch by Lars Wendler.
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-python/IcePy/files/IcePy-3.2.1-python-2.6.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/files/IcePy-3.2.1-python-2.6.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/files/IcePy-3.2.1-python-2.6.diff?rev=1.1&content-type=text/plain
13
14 Index: IcePy-3.2.1-python-2.6.diff
15 ===================================================================
16 --- IcePy-3.2.1/config/Make.rules
17 +++ IcePy-3.2.1/config/Make.rules
18 @@ -69,7 +69,7 @@
19 # version used for building the Ice extension, then set PYTHON_VERSION
20 # to "python2.3" or "python2.4".
21 #
22 - PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard /usr/include/python2.[345]*)))
23 + PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard /usr/include/python2.[34567]*)))
24 ifeq ($(PYTHON_VERSION),)
25 python_darwin_home = /System/Library/Frameworks/Python.framework/Versions/Current
26 PYTHON_VERSION = $(word 1,$(notdir $(wildcard $(python_darwin_home)/include/python2.[345]*)))
27 @@ -82,7 +82,7 @@
28 ifneq ($(PYTHON_HOME),)
29 $(error Unable to find a Python interpreter at PYTHON_HOME=$(PYTHON_HOME). See config/Make.rules)
30 else
31 - $(error Unable to find Python 2.3, 2.4, or 2.5. See config/Make.rules)
32 + $(error Unable to find Python 2.3, 2.4, 2.5, 2.6 or 2.7. See config/Make.rules)
33 endif
34 endif