Hi Scott,
I looked at the data you sent.
I don't have a Fedora 14 system with python 2.7 where I can reproduce this.
I suspect something else modified this file and thus the jcc patch doesn't
apply out of the box.
I can't guess what you have in that file so I don't know what to tell you
off hand. If you send me the original file, I can try to patch it manually.
Have you looked at it ? Does it look difficult for you to do ?
Andi..
On Tue, 24 Jan 2012, Scott D Anderson wrote:
On Tue, Jan 24, 2012 at 4:37 PM, Andi Vajda <va...@apache.org> wrote:
On Tue, 24 Jan 2012, Scott D Anderson wrote:
Sorry for the confusion. I named it pylucene-install.log, but that's just
a rename
of the typescript file.
Your messages have no attachments. Maybe they're being filtered out.
Can you include it inline since it's plain text anyway ?
Andi..
Sure. Here's the typescript:
Script started on Tue 24 Jan 2012 01:07:10 PM EST
[root@sampras tmp] cat /etc/issue
Fedora release 14 (Laughlin)
Kernel \r on an \m (\l)
[root@sampras tmp] rpm -qV python-setuptools
[root@sampras tmp] ls -l /usr/lib/python2.7/site-packages/setuptools*
-rw-r--r-- 1 root root 144 Oct 26 22:05
/usr/lib/python2.7/site-packages/setuptools-0.6c11-py2.7.egg-info
-rw-r--r-- 1 root root 34 Oct 26 22:05
/usr/lib/python2.7/site-packages/setuptools.pth
/usr/lib/python2.7/site-packages/setuptools:
total 300
-rw-r--r-- 1 root root 5927 Oct 26 22:04 archive_util.py
-rw-r--r-- 2 root root 5725 Oct 26 22:05 archive_util.pyc
-rw-r--r-- 2 root root 5725 Oct 26 22:05 archive_util.pyo
drwxr-xr-x 2 root root 4096 Jan 24 11:47 command
-rw-r--r-- 1 root root 6209 Oct 26 22:04 depends.py
-rw-r--r-- 2 root root 6749 Oct 26 22:05 depends.pyc
-rw-r--r-- 2 root root 6749 Oct 26 22:05 depends.pyo
-rw-r--r-- 1 root root 30309 Oct 26 22:04 dist.py
-rw-r--r-- 1 root root 30221 Oct 26 22:05 dist.pyc
-rw-r--r-- 1 root root 30163 Oct 26 22:05 dist.pyo
-rw-r--r-- 1 root root 1278 Oct 26 22:04 extension.py
-rw-r--r-- 2 root root 1761 Oct 26 22:05 extension.pyc
-rw-r--r-- 2 root root 1761 Oct 26 22:05 extension.pyo
-rw-r--r-- 1 root root 1278 Oct 26 22:04 extension.py.orig
-rw-r--r-- 1 root root 3744 Oct 26 22:04 __init__.py
-rw-r--r-- 2 root root 4028 Oct 26 22:05 __init__.pyc
-rw-r--r-- 2 root root 4028 Oct 26 22:05 __init__.pyo
-rw-r--r-- 1 root root 30447 Oct 26 22:04 package_index.py
-rw-r--r-- 2 root root 28625 Oct 26 22:05 package_index.pyc
-rw-r--r-- 2 root root 28625 Oct 26 22:05 package_index.pyo
-rw-r--r-- 1 root root 8756 Oct 26 22:04 sandbox.py
-rw-r--r-- 2 root root 11425 Oct 26 22:05 sandbox.pyc
-rw-r--r-- 2 root root 11425 Oct 26 22:05 sandbox.pyo
[root@sampras tmp] patch -d /usr/lib/python2.7/site-packages -Nup0 <
/usr/network/tmp/pylucene-3.5.0-3 /jcc/jcc/patches/patch.43.0.6c11
patching file setuptools/extension.py
Hunk #1 succeeded at 32 (offset 4 lines).
patching file setuptools/command/build_ext.py
Hunk #1 FAILED at 85.
Hunk #2 succeeded at 177 (offset 7 lines).
Hunk #3 succeeded at 259 (offset 7 lines).
1 out of 3 hunks FAILED -- saving rejects to file
setuptools/command/build_ext.py.rej
[root@sampras tmp] exit
Script done on Tue 24 Jan 2012 01:08:32 PM EST
and here's the contents of build_ex.py.rej
--- setuptools/command/build_ext.py (revision 75864)
+++ setuptools/command/build_ext.py (working copy)
@@ -85,8 +85,12 @@
if fullname in self.ext_map:
ext = self.ext_map[fullname]
if isinstance(ext,Library):
+ if ext.force_shared and not use_stubs:
+ _libtype = 'shared'
+ else:
+ _libtype = libtype
fn, ext = os.path.splitext(filename)
- return self.shlib_compiler.library_filename(fn,libtype)
+ return self.shlib_compiler.library_filename(fn,_libtype)
elif use_stubs and ext._links_to_dynamic:
d,fn = os.path.split(filename)
return os.path.join(d,'dl-'+fn)
Thanks for your help.
Scott
Scott
Andi..
standard python-setuptools from the distribution and I show that it's
running setuptools-0.6c11.
I've also attached the file of rejects listed above.
Since you have a pretty sophisticated patch setup, I'm hoping that
you'll
be able to solve this pretty
easily. Please let me know if there's any way I can help.
Thanks for your support,
Scott
--
Scott D. Anderson
Computer Science Department
Wellesley College
scott.ander...@acm.org
scott.ander...@wellesley.edu
--
Scott D. Anderson
Computer Science Department
Wellesley College
scott.ander...@acm.org
scott.ander...@wellesley.edu
--
Scott D. Anderson
Computer Science Department
Wellesley College
scott.ander...@acm.org
scott.ander...@wellesley.edu
