You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2010/03/23 04:51:31 UTC
svn commit: r926461 - in /lucene/pylucene/trunk/jcc: helpers/linux.py
setup.py
Author: vajda
Date: Tue Mar 23 03:51:31 2010
New Revision: 926461
URL: http://svn.apache.org/viewvc?rev=926461&view=rev
Log:
debugged linux changes
Modified:
lucene/pylucene/trunk/jcc/helpers/linux.py
lucene/pylucene/trunk/jcc/setup.py
Modified: lucene/pylucene/trunk/jcc/helpers/linux.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/helpers/linux.py?rev=926461&r1=926460&r2=926461&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/helpers/linux.py (original)
+++ lucene/pylucene/trunk/jcc/helpers/linux.py Tue Mar 23 03:51:31 2010
@@ -43,7 +43,9 @@ See %s/INSTALL for more information abou
''' %(patch_version, st_egg, jccdir, patch_version, st_egg, jccdir)
-def patch_setuptools():
+def patch_setuptools(with_setuptools):
+
+ with_setuptools_c11 = ('00000000', '00000006', '*c', '00000011', '*final')
try:
from setuptools.command.build_ext import sh_link_shared_object
Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=926461&r1=926460&r2=926461&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Tue Mar 23 03:51:31 2010
@@ -158,14 +158,13 @@ try:
enable_shared = False
with_setuptools_c7 = ('00000000', '00000006', '*c', '00000007', '*final')
- with_setuptools_c11 = ('00000000', '00000006', '*c', '00000011', '*final')
if with_setuptools >= with_setuptools_c7 and 'NO_SHARED' not in os.environ:
if platform in ('darwin', 'ipod', 'win32'):
enable_shared = True
elif platform == 'linux2':
from helpers.linux import patch_setuptools
- enable_shared = patch_setuptools()
+ enable_shared = patch_setuptools(with_setuptools)
elif platform == 'mingw32':
enable_shared = True
# need to monkeypatch the CygwinCCompiler class to generate