Re: [PATCH] swig-ra-fixes.patch

On Wed, Dec 11, 2002 at 06:55:51PM -0800, Brandon Ehle wrote:
> Ooops, forgot to paste the log message.
>
> * subversion/bindings/swig/svn_ra.i,
> subversion/bindings/swig/python/setup.py
> Fix _ra.so missing symbol errors at runtime for
> the python SWIG extension.

This patch is munged spacing-wise (fixed version below), but really
needs applying. At least on OS X, without it, you get errors while
linking _ra.so:

gcc -Wl,-F. -Wl,-flat_namespace,-U,_environ -bundle -framework Python build/temp.darwin-6.2-Power Macintosh-2.2/svn_ra.o -L/usr/local/encap/httpd-2.0/lib -L/Users/nicholas/src/svn/obj/subversion/libsvn_client/.libs -L/Users/nicholas/src/svn/obj/subversion/libsvn_delta/.libs -L/Users/nicholas/src/svn/obj/subversion/libsvn_fs/.libs -L/Users/nicholas/src/svn/obj/subversion/libsvn_ra/.libs -L/Users/nicholas/src/svn/obj/subversion/libsvn_repos/.libs -L/Users/nicholas/src/svn/obj/subversion/libsvn_wc/.libs -L/Users/nicholas/src/svn/obj/subversion/libsvn_subr/.libs -L/Users/nicholas/src/svn/obj/subversion/bindings/swig/.libs -lsvn_ra-1 -lswigpy -o build/lib.darwin-6.2-Power Macintosh-2.2/svn/_ra.so
[...]
ld: Undefined symbols:
_acquire_py_lock
_release_py_lock
error: command 'gcc' failed with exit status 1
make: *** [swig-py-ext] Error 1

The corrected patch:

Index: subversion/bindings/swig/svn_ra.i
===================================================================
--- subversion/bindings/swig/svn_ra.i (revision 4101)
+++ subversion/bindings/swig/svn_ra.i (working copy)
@@ -36,4 +36,12 @@
 %include svn_ra.h
 %{
 #include "svn_ra.h"
+
+#ifdef SWIGPYTHON
+#include "swigutil_py.h"
+#endif
+
+#ifdef SWIGJAVA
+#include "swigutil_java.h"
+#endif
 %}
Index: subversion/bindings/swig/python/setup.py
===================================================================
--- subversion/bindings/swig/python/setup.py (revision 4101)
+++ subversion/bindings/swig/python/setup.py (working copy)
@@ -167,7 +167,7 @@
                             ),
              core.Extension("_ra",
                             [source_dir + "/svn_ra.i"],
- libraries=['svn_ra-1', 'swigpy'],
+ libraries=['svn_ra-1', 'svn_swig_py-1', 'swigpy'],
                             library_dirs=library_dirs,
                             extra_compile_args=extra_compile_args,
                             extra_link_args=extra_link_args,

-- 
=Nicholas Riley <njriley_at_uiuc.edu> | <http://www.uiuc.edu/ph/www/njriley>
        Pablo Research Group, Department of Computer Science and
  Medical Scholars Program, University of Illinois at Urbana-Champaign
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org