pysvn on IRIX - the attached patch makes it work.

Thread: pysvn on IRIX - the attached patch makes it work.

Search this list only Search all lists
pysvn on IRIX - the attached patch makes it work.
	2006-11-28 13:36:14
carcosa:cko[149] gunzip < pysvn-1.5.0.tar.gz \| tar xf - 100% 5353 5.2KB/s 00:01 carcosa:cko[150] cd pysvn-1.5.0/ carcosa:cko[151] patch -p1 <../pysvn_irix.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Exception.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Exception.hxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Exception.hxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Exception.hxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/CXX/Exception.hxx using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.h xx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/IndirectPythonInt erface.hxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.h xx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/IndirectPythonInt erface.hxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Objects.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Objects.hxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Objects.hxx Sat Oct 21 10:43:19 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Objects.hxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/CXX/Objects.hxx using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/example.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/example.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/example.cxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/example.cxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Demo/example.cxx using Plan A... Hunk #1 succeeded at 10. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Demo/pycxx_iter.cxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/python.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/python.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/python.cxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/python.cxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Demo/python.cxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxx_extensions.cx x \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx Sat Oct 14 20:31:41 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxx_extensions.cx x Tue Nov 28 12:58:06 2006 -------------------------- Patching file Import/pycxx-5.3.6/Src/cxx_extensions.cxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxextensions.c Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxxextensions.c Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Src/cxxextensions.c using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Source/pysvn.hpp pysvn-1.5.0-patched/Source/pysvn.hpp \|--- pysvn-1.5.0/Source/pysvn.hpp Sat Sep 30 13:55:28 2006 \|+++ pysvn-1.5.0-patched/Source/pysvn.hpp Tue Nov 28 12:48:44 2006 -------------------------- Patching file Source/pysvn.hpp using Plan A... Hunk #1 succeeded at 7. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Source/setup.py pysvn-1.5.0-patched/Source/setup.py \|--- pysvn-1.5.0/Source/setup.py Mon Oct 16 23:51:38 2006 \|+++ pysvn-1.5.0-patched/Source/setup.py Tue Nov 28 13:13:00 2006 -------------------------- Patching file Source/setup.py using Plan A... Hunk #1 succeeded at 217. Hunk #2 succeeded at 270. done carcosa:cko[152] cd Source carcosa:cko[153] python setup.py configure Info: Found Python include in /opt/local/include/python2.4 Info: Found PyCXX include in /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 Info: Found SVN include in /opt/local/include/subversion-1 Info: Found APR include in /opt/local/include/apr-0 Info: Found SVN library in /opt/local/lib Info: Found APR library in /opt/local/lib Info: Creating Makefile for Source Info: Creating Makefile for Tests carcosa:cko[154] make /opt/local/bin/python ../Docs/generate_cpp_docs_from_html_docs.py /opt/local/include/subversion-1 ../Docs/pysvn_prog_ref.html pysvn_docs.hpp pysvn_docs.cpp svn_include /opt/local/include/subversion-1 html_doc ../Docs/pysvn_prog_ref.html cpp_header_filename pysvn_docs.hpp cpp_module_filename pysvn_docs.cpp Info: Building against SVN 1.4.2 code 1004002 touch pysvn_docs.hpp /opt/local/bin/python ../Builder/brand_version.py ../Builder/version.info pysvn_version.hpp.template Info: Running svnversion -c ".." 2>&1 Info: revision exported g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn.o pysvn.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_callbacks.o pysvn_callbacks.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_client.o pysvn_client.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_enum_string.o pysvn_enum_string.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_transaction.o pysvn_transaction.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_revision.o pysvn_revision.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_docs.o pysvn_docs.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_path.o pysvn_path.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_arg_processing.o pysvn_arg_processing.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_converters.o pysvn_converters.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_svnenv.o pysvn_svnenv.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_profile.o pysvn_profile.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o cxxsupport.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxsupp ort.cxx g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o cxx_extensions.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_ext ensions.cxx gcc -c -c -Wall -fPIC -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -o cxxextensions.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxexte nsions.c g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o IndirectPythonInterface.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/Indirec tPythonInterface.cxx g++ -shared -o pysvn/_pysvn.so pysvn.o pysvn_callbacks.o pysvn_client.o pysvn_enum_string.o pysvn_transaction.o pysvn_revision.o pysvn_docs.o pysvn_path.o pysvn_arg_processing.o pysvn_converters.o pysvn_svnenv.o pysvn_profile.o cxxsupport.o cxx_extensions.o cxxextensions.o IndirectPythonInterface.o -L/opt/local/lib -lsvn_client-1 -lsvn_diff-1 -lsvn_repos-1 -lneon ld32: WARNING 84 : /usr/lib32/libm.so is not used for resolving any symbol. ld32: WARNING 127: Two shared objects with the same soname, /usr/lib32/mips3/libm.so and /usr/lib32/libm.so, have been been linked. This is probably due to a missing -L specification. Ignoring the latter. ld32: WARNING 47 : This module (pysvn.o .text) contains branch instruction(s) that might degrade performance on an older version (rev. 2.2) R4000 processor. carcosa:cko[155] cp -rp pysvn /opt/local//lib/python2.4/site-packages carcosa:cko[156] python Python 2.4.2 (#2, Feb 24 2006, 05:58:01) [GCC 3.4.5] on irix6 Type "help", "copyright", "credits" or "license" for more information. >>> import pysvn >>> c=pysvn.Client() >>> c.ls("http://svn/svn") [<PysvnDirent http://svn/svn/caa>, <PysvnDirent http://svn/svn/ctb>, <PysvnDirent http://svn/svn/installer >, <PysvnDirent http://svn/svn/qt>, <PysvnDirent http://svn/svn/scons> , <PysvnDirent http://svn/svn/style> , <PysvnDirent http://svn/svn/support> , <PysvnDirent http://svn/svn/tools> , <PysvnDirent http://svn/svn/uims>, <PysvnDirent http://svn/svn/utm>] >>> ------------------------------------------------------------ --------- To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org For additional commands, e-mail: dev-helppysvn.tigris.org

pysvn on IRIX - the attached patch makes it work.
	2006-11-28 16:24:11
Carsten Koch wrote: ... >>>> diff -ru pysvn-1.5.0/Source/setup.py pysvn-1.5.0-patched/Source/setup.py >>>> --- pysvn-1.5.0/Source/setup.py Mon Oct 16 23:51:38 2006 >>>> +++ pysvn-1.5.0-patched/Source/setup.py Tue Nov 28 13:13:00 2006 >>>> -217,6 +217,10 >>>> else: >>>> template_values['python_exp'] = 'python.exp' >>>> makefile.write( self.makefile_template_aix % template_values ) >>>> + elif sys.platform == "irix6": >>>> + if self.verbose: >>>> + print 'Info: Using IRIX makefile template' >>>> + makefile.write( self.makefile_template_irix6 % template_values ) >>>> else: >>>> if self.verbose: >>>> print 'Info: Using unix makefile template' >>>> -266,6 +270,29 >>>> >>>> #include pysvn_common.mak >>>> ''' >>>> + >>>> + makefile_template_irix6 = '''# >>>> +# Created by pysvn Extension/Source/setup.py >>>> +# -- makefile_template_irix6 -- >>>> +# >>>> +PYTHON=%(python_exe)s >>>> +SVN_INCLUDE=%(svn_include)s >>>> +CCC=g++ -c >>>> +CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s >>>> +CC=gcc -c >>>> +CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s >>>> +PYCXX=%(pycxx_dir)s >>>> +LDSHARED=g++ -shared %(debug_cflags)s >>>> +LDLIBS=-L%(svn_lib_dir)s >>>> +-lsvn_client-1 >>>> +-lsvn_diff-1 >>>> +-lsvn_repos-1 >>>> +-lneon >>>> + >>>> +#include pysvn_common.mak >>>> +''' >>>> + >>>> + >>>> >>>> makefile_template_aix = '''# >>>> # Created by pysvn Extension/Source/setup.py >>>> I had to do the same thing for Solaris and for HP-UX. It appears that -Wl,--rpath -Wl,%(svn_lib_dir)s and -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -lcom_err -lresolv -lexpat are in fact inappropriate for all UNIX platforms I have tested so far. On which ones do these options work? Carsten. ------------------------------------------------------------ --------- To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org For additional commands, e-mail: dev-helppysvn.tigris.org

pysvn on IRIX - the attached patch makes it work.
	2006-11-29 20:53:17
On Nov 28, 2006, at 16:24, Carsten Koch wrote: > Carsten Koch wrote: > ... >>>>> diff -ru pysvn-1.5.0/Source/setup.py pysvn-1.5.0-patched/Source/ >>>>> setup.py >>>>> --- pysvn-1.5.0/Source/setup.py Mon Oct 16 23:51:38 2006 >>>>> +++ pysvn-1.5.0-patched/Source/setup.py Tue Nov 28 13:13:00 2006 >>>>> -217,6 +217,10 >>>>> else: >>>>> template_values['python_exp'] = 'python.exp' >>>>> makefile.write( self.makefile_template_aix % >>>>> template_values ) >>>>> + elif sys.platform == "irix6": >>>>> + if self.verbose: >>>>> + print 'Info: Using IRIX makefile template' >>>>> + makefile.write( self.makefile_template_irix6 % >>>>> template_values ) >>>>> else: >>>>> if self.verbose: >>>>> print 'Info: Using unix makefile template' >>>>> -266,6 +270,29 >>>>> >>>>> #include pysvn_common.mak >>>>> ''' >>>>> + >>>>> + makefile_template_irix6 = '''# >>>>> +# Created by pysvn Extension/Source/setup.py >>>>> +# -- makefile_template_irix6 -- >>>>> +# >>>>> +PYTHON=%(python_exe)s >>>>> +SVN_INCLUDE=%(svn_include)s >>>>> +CCC=g++ -c >>>>> +CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s % >>>>> (py_cflags)s %(debug_cflags)s >>>>> +CC=gcc -c >>>>> +CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s >>>>> +PYCXX=%(pycxx_dir)s >>>>> +LDSHARED=g++ -shared %(debug_cflags)s >>>>> +LDLIBS=-L%(svn_lib_dir)s >>>>> +-lsvn_client-1 >>>>> +-lsvn_diff-1 >>>>> +-lsvn_repos-1 >>>>> +-lneon >>>>> + >>>>> +#include pysvn_common.mak >>>>> +''' >>>>> + >>>>> + >>>>> >>>>> makefile_template_aix = '''# >>>>> # Created by pysvn Extension/Source/setup.py >>>>> > > I had to do the same thing for Solaris and for HP-UX. > It appears that > -Wl,--rpath -Wl,%(svn_lib_dir)s > and > -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -lcom_err - > lresolv -lexpat > are in fact inappropriate for all UNIX platforms I have tested so far. > On which ones do these options work? > Linux. Seems like I need a Linux detect and then do these options and leave things in a simpler form for other unix. Barry ------------------------------------------------------------ --------- To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org For additional commands, e-mail: dev-helppysvn.tigris.org

pysvn on IRIX - the attached patch makes it work.
	2006-12-03 18:43:09

Carsen, I'm looking at this patch to apply it PyCXX on sf.net. But I need to know more about what is going on. Is this a bug in Python.h that requires a work around? Which version of python is this for? What is the error that this fixes? Is this to do with select? I seem to remember a problem around select but cannot track down the mail. Barry On Nov 28, 2006, at 13:36, Carsten Koch wrote: carcosa:cko[149] gunzip < pysvn-1.5.0.tar.gz \| tar xf - 100% 5353 5.2KB/s 00:01 carcosa:cko[150] cd pysvn-1.5.0/ carcosa:cko[151] patch -p1 <../pysvn_irix.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Exception.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Exception.hxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Exception.hxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Exception.hxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/CXX/Exception.hxx using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Objects.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Objects.hxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Objects.hxx Sat Oct 21 10:43:19 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Objects.hxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/CXX/Objects.hxx using Plan A... Hunk #1 succeeded at 6. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/example.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/example.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/example.cxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/example.cxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Demo/example.cxx using Plan A... Hunk #1 succeeded at 10. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Demo/pycxx_iter.cxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/python.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/python.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/python.cxx Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/python.cxx Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Demo/python.cxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxx_extensions.cxx \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx Sat Oct 14 20:31:41 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxx_extensions.cxx Tue Nov 28 12:58:06 2006 -------------------------- Patching file Import/pycxx-5.3.6/Src/cxx_extensions.cxx using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|--- pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxextensions.c Sun Apr 9 17:39:23 2006 \|+++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxxextensions.c Tue Nov 28 12:48:44 2006 -------------------------- Patching file Import/pycxx-5.3.6/Src/cxxextensions.c using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Source/pysvn.hpp pysvn-1.5.0-patched/Source/pysvn.hpp \|--- pysvn-1.5.0/Source/pysvn.hpp Sat Sep 30 13:55:28 2006 \|+++ pysvn-1.5.0-patched/Source/pysvn.hpp Tue Nov 28 12:48:44 2006 -------------------------- Patching file Source/pysvn.hpp using Plan A... Hunk #1 succeeded at 7. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- \| \|diff -ru pysvn-1.5.0/Source/setup.py pysvn-1.5.0-patched/Source/setup.py \|--- pysvn-1.5.0/Source/setup.py Mon Oct 16 23:51:38 2006 \|+++ pysvn-1.5.0-patched/Source/setup.py Tue Nov 28 13:13:00 2006 -------------------------- Patching file Source/setup.py using Plan A... Hunk #1 succeeded at 217. Hunk #2 succeeded at 270. done carcosa:cko[152] cd Source carcosa:cko[153] python setup.py configure Info: Found Python include in /opt/local/include/python2.4 Info: Found PyCXX include in /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 Info: Found SVN include in /opt/local/include/subversion-1 Info: Found APR include in /opt/local/include/apr-0 Info: Found SVN library in /opt/local/lib Info: Found APR library in /opt/local/lib Info: Creating Makefile for Source Info: Creating Makefile for Tests carcosa:cko[154] make /opt/local/bin/python ../Docs/generate_cpp_docs_from_html_docs.py /opt/local/include/subversion-1 ../Docs/pysvn_prog_ref.html pysvn_docs.hpp pysvn_docs.cpp svn_include /opt/local/include/subversion-1 html_doc ../Docs/pysvn_prog_ref.html cpp_header_filename pysvn_docs.hpp cpp_module_filename pysvn_docs.cpp Info: Building against SVN 1.4.2 code 1004002 touch pysvn_docs.hpp /opt/local/bin/python ../Builder/brand_version.py ../Builder/version.info pysvn_version.hpp.template Info: Running svnversion -c ".." 2>&1 Info: revision exported g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn.o pysvn.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_callbacks.o pysvn_callbacks.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_client.o pysvn_client.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_enum_string.o pysvn_enum_string.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_transaction.o pysvn_transaction.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_revision.o pysvn_revision.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_docs.o pysvn_docs.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_path.o pysvn_path.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_arg_processing.o pysvn_arg_processing.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_converters.o pysvn_converters.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_svnenv.o pysvn_svnenv.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o pysvn_profile.o pysvn_profile.cpp g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o cxxsupport.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxsupport.cxx g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o cxx_extensions.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx gcc -c -c -Wall -fPIC -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -o cxxextensions.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxextensions.c g++ -c -Wall -fPIC -fexceptions -frtti -I/opt/local/include/python2.4 -I/opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6 -I/opt/local/include/subversion-1 -I/opt/local/include/apr-0 -I. -DNDEBUG -o IndirectPythonInterface.o /opt/local/source/pysvn-1.5.0/Import/pycxx-5.3.6/Src/IndirectPythonInterface.cxx g++ -shared -o pysvn/_pysvn.so pysvn.o pysvn_callbacks.o pysvn_client.o pysvn_enum_string.o pysvn_transaction.o pysvn_revision.o pysvn_docs.o pysvn_path.o pysvn_arg_processing.o pysvn_converters.o pysvn_svnenv.o pysvn_profile.o cxxsupport.o cxx_extensions.o cxxextensions.o IndirectPythonInterface.o -L/opt/local/lib -lsvn_client-1 -lsvn_diff-1 -lsvn_repos-1 -lneon ld32: WARNING 84 : /usr/lib32/libm.so is not used for resolving any symbol. ld32: WARNING 127: Two shared objects with the same soname, /usr/lib32/mips3/libm.so and /usr/lib32/libm.so, have been been linked. This is probably due to a missing -L specification. Ignoring the latter. ld32: WARNING 47 : This module (pysvn.o .text) contains branch instruction(s) that might degrade performance on an older version (rev. 2.2) R4000 processor. carcosa:cko[155] cp -rp pysvn /opt/local//lib/python2.4/site-packages carcosa:cko[156] python Python 2.4.2 (#2, Feb 24 2006, 05:58:01) [GCC 3.4.5] on irix6 Type "help", "copyright", "credits" or "license" for more information. import pysvn c=pysvn.Client() c.ls("http://svn/svn") [<PysvnDirent http://svn/svn/caa>, <PysvnDirent http://svn/svn/ctb>, <PysvnDirent http://svn/svn/installer>, <PysvnDirent http://svn/svn/qt>;, <PysvnDirent http://svn/svn/scons>, <PysvnDirent http://svn/svn/style>, <PysvnDirent http://svn/svn/support>, <PysvnDirent http://svn/svn/tools>, <PysvnDirent http://svn/svn/uims>, <PysvnDirent http://svn/svn/utm>] diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Exception.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Exception.hxx --- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Exception.hxx Sun Apr 9 17:39:23 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Exception.hxx Tue Nov 28 12:48:44 2006 -6,6 +6,10 #ifndef __CXX_Exception_h #define __CXX_Exception_h +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #include "CXX/Version.hxx" #include "CXX/Config.hxx" diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx --- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx Sun Apr 9 17:39:23 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/IndirectPythonInterface.hxx Tue Nov 28 12:48:44 2006 -1,6 +1,9 #ifndef __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ #define __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ +#ifdef __sgi +#include <sys/time.h> +#endif #include <Python.h> namespace Py diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Objects.hxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Objects.hxx --- pysvn-1.5.0/Import/pycxx-5.3.6/CXX/Objects.hxx Sat Oct 21 10:43:19 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/CXX/Objects.hxx Tue Nov 28 12:48:44 2006 -6,6 +6,10 #ifndef __CXX_Objects__h #define __CXX_Objects__h +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #include "CXX/Version.hxx" #include "CXX/Config.hxx" diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/example.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/example.cxx --- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/example.cxx Sun Apr 9 17:39:23 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/example.cxx Tue Nov 28 12:48:44 2006 -10,6 +10,10 #endif +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #include "CXX/Objects.hxx" #include "CXX/Extensions.hxx" diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx --- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx Sun Apr 9 17:39:23 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/pycxx_iter.cxx Tue Nov 28 12:48:44 2006 -1,4 +1,9 #include "pycxx_iter.hxx" + +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #include "CXX/Objects.hxx" diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Demo/python.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/python.cxx --- pysvn-1.5.0/Import/pycxx-5.3.6/Demo/python.cxx Sun Apr 9 17:39:23 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Demo/python.cxx Tue Nov 28 12:48:44 2006 -1,5 +1,9 /* Minimal main program -- everything is loaded from the library / +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #include <iostream> diff -ru pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxx_extensions.cxx --- pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxx_extensions.cxx Sat Oct 14 20:31:41 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxx_extensions.cxx Tue Nov 28 12:58:06 2006 -1,3 +1,7 +#ifdef __sgi +#include <sys/time.h> +#endif + #include "CXX/Extensions.hxx" #include "CXX/Exception.hxx" --- pysvn-1.5.0/Import/pycxx-5.3.6/Src/cxxextensions.c Sun Apr 9 17:39:23 2006 +++ pysvn-1.5.0-patched/Import/pycxx-5.3.6/Src/cxxextensions.c Tue Nov 28 12:48:44 2006 -3,6 +3,10 All rights reserved. See Legal.htm for full text and disclaimer. / +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #ifdef __cplusplus extern "C" diff -ru pysvn-1.5.0/Source/pysvn.hpp pysvn-1.5.0-patched/Source/pysvn.hpp --- pysvn-1.5.0/Source/pysvn.hpp Sat Sep 30 13:55:28 2006 +++ pysvn-1.5.0-patched/Source/pysvn.hpp Tue Nov 28 12:48:44 2006 -7,6 +7,10 // // ==================================================================== // +#ifdef __sgi +#include <sys/time.h> +#endif + #include "Python.h" #include "CXX/Objects.hxx" #include "CXX/Extensions.hxx" diff -ru pysvn-1.5.0/Source/setup.py pysvn-1.5.0-patched/Source/setup.py --- pysvn-1.5.0/Source/setup.py Mon Oct 16 23:51:38 2006 +++ pysvn-1.5.0-patched/Source/setup.py Tue Nov 28 13:13:00 2006 -217,6 +217,10 else: template_values['python_exp'] = 'python.exp' makefile.write( self.makefile_template_aix % template_values ) + elif sys.platform == "irix6": + if self.verbose: + print 'Info: Using IRIX makefile template' + makefile.write( self.makefile_template_irix6 % template_values ) else: if self.verbose: print 'Info: Using unix makefile template' -266,6 +270,29 #include pysvn_common.mak ''' + + makefile_template_irix6 = '''# +# Created by pysvn Extension/Source/setup.py +# -- makefile_template_irix6 -- +# +PYTHON=%(python_exe)s +SVN_INCLUDE=%(svn_include)s +CCC=g++ -c +CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s +CC=gcc -c +CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s +PYCXX=%(pycxx_dir)s +LDSHARED=g++ -shared %(debug_cflags)s +LDLIBS=-L%(svn_lib_dir)s +-lsvn_client-1 +-lsvn_diff-1 +-lsvn_repos-1 +-lneon + +#include pysvn_common.mak +''' + + makefile_template_aix = '''# # Created by pysvn Extension/Source/setup.py --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org">dev-unsubscribepysvn.tigris.org For additional commands, e-mail: dev-helppysvn.tigris.org">dev-helppysvn.tigris.org
pysvn on IRIX - the attached patch makes it work.
	2006-12-03 22:18:44
Barry Scott wrote: > Carsen, > > I'm looking at this patch to apply it PyCXX on sf.net. > But I need to know more about what is going on. > > Is this a bug in Python.h that requires a work around? > Which version of python is this for? > > What is the error that this fixes? > > Is this to do with select? I seem to remember a problem around select > but cannot track down the mail. Hi Barry, two things need to be done to make pysvn work on IRIX. 1) Fix a compile error that has to do with screwed-up IRIX header files. I know it is awful to work around IRIX bugs by changing pysvn, but realistically SGI will never fix this and even if they do - that would not make pysvn work on older IRIX versions. See our discussion on the pysvn users list in February. Back then we tried many things to fix it more cleanly, but we failed. The bottom line: in our combined efforts, we could not find a better way to make it work. 2) Fix the link error that is caused by the facts that krb5 libraries do not exist on most UNIX systems and that -Wl,--rpath -Wl,%(svn_lib_dir)s is not accepted by most linkers. So, these two things are the things that my patch does. With the patch, pysvn 1.5.0 can be built on IRIX 6 and is working fine. Carsten. ------------------------------------------------------------ --------- To unsubscribe, e-mail: dev-unsubscribepysvn.tigris.org For additional commands, e-mail: dev-helppysvn.tigris.org

[1-5]

about | contact Other archives ( Real Estate discussion Medical topics )