OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Oct-2008 20:13:22
Branch: HEAD Handle: 2008102619132200
Modified files:
openpkg-src/subversion subversion.patch
Log:
fix Perl binding linking
Summary:
Revision Changes Path
1.22 +27 -19 openpkg-src/subversion/subversion.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.21 -r1.22 subversion.patch
--- openpkg-src/subversion/subversion.patch 19 Jun 2008 19:48:27 -0000
1.21
+++ openpkg-src/subversion/subversion.patch 26 Oct 2008 19:13:22 -0000
1.22
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2008-02-24 04:36:03 +0100
-+++ Makefile.in 2008-04-03 09:53:06 +0200
-@@ -155,7 +155,7 @@
+--- Makefile.in.orig 2008-08-26 19:27:56 +0200
++++ Makefile.in 2008-10-26 19:57:16 +0100
+@@ -156,7 +156,7 @@
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
# special compilation for files destined for mod_dav_svn
@@ -10,7 +10,7 @@
# special compilation for files destined for libsvn_swig_* (e.g.
swigutil_*.c)
COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE)
$(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
-@@ -170,7 +170,7 @@
+@@ -171,7 +171,7 @@
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS)
$(LDFLAGS) -rpath $(libdir)
# special link rule for mod_dav_svn
@@ -19,7 +19,7 @@
# Compilation of SWIG-generated C source code
COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile
$(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
-@@ -638,7 +638,7 @@
+@@ -639,7 +639,7 @@
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
@@ -29,8 +29,8 @@
swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
$(SWIG_PL_DIR)/native/Makefile
Index: apr-util/crypto/getuuid.c
---- apr-util/crypto/getuuid.c.orig 2008-03-13 08:00:29 +0100
-+++ apr-util/crypto/getuuid.c 2008-04-03 09:53:51 +0200
+--- apr-util/crypto/getuuid.c.orig 2008-10-22 15:55:26 +0200
++++ apr-util/crypto/getuuid.c 2008-10-26 19:57:16 +0100
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -41,8 +41,8 @@
return rand() & 0x0FFFF;
Index: build-outputs.mk
---- build-outputs.mk.orig 2008-03-13 08:00:51 +0100
-+++ build-outputs.mk 2008-04-03 09:53:06 +0200
+--- build-outputs.mk.orig 2008-10-22 15:55:50 +0200
++++ build-outputs.mk 2008-10-26 19:57:16 +0100
@@ -333,7 +333,7 @@
mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo
subversion/mod_dav_svn/authz.lo subversion/mod_dav_svn/deadprops.lo
subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo
subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mirror.lo
subversion/mod_dav_svn/mod_dav_svn.lo
subversion/mod_dav_svn/reports/dated-rev.lo
subversion/mod_dav_svn/reports/file-revs.lo
subversion/mod_dav_svn/reports/get-location-segments.lo
subversion/mod_dav_svn/reports/get-locations.lo
subversion/mod_dav_svn/reports/get-locks.lo
subversion/mod_dav_svn/reports/log.lo
subversion/mod_dav_svn/reports/mergeinfo.lo
subversion/mod_dav_svn/reports/replay.lo
subversion/mod_dav_svn/reports/update.lo subversion/mod_dav_svn/repos.lo
subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
mod_dav_svn_OBJECTS = activity.lo authz.lo deadprops.lo liveprops.lo
lock.lo merge.lo mirror.lo mod_dav_svn.lo reports/dated-rev.lo
reports/file-revs.lo reports/get-location-segments.lo reports/get-locations.lo
reports/get-locks.lo reports/log.lo reports/mergeinfo.lo reports/replay.lo
reports/update.lo repos.lo util.lo version.lo
@@ -53,9 +53,9 @@
opt_test_PATH = subversion/tests/libsvn_subr
opt_test_DEPS = subversion/tests/libsvn_subr/opt-test.o
subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
Index: configure
---- configure.orig 2008-03-13 08:00:53 +0100
-+++ configure 2008-04-03 09:53:06 +0200
-@@ -4958,6 +4958,11 @@
+--- configure.orig 2008-10-22 15:55:52 +0200
++++ configure 2008-10-26 19:57:16 +0100
+@@ -5092,6 +5092,11 @@
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
@@ -68,14 +68,14 @@
if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args
then :
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2007-10-22
09:00:25 +0200
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-04-03
09:54:42 +0200
-@@ -23,17 +23,13 @@
- ra_dav
+--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2008-03-22
00:44:46 +0100
++++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-10-26
19:58:05 +0100
+@@ -25,17 +25,13 @@
fs_base
+
fs_util
fs_fs/));
-my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
-+my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta ra_dav
subr ra_local ra_svn fs_base fs_fs/);
++my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta client
ra_dav subr ra_local ra_serf ra_neon ra_svn fs_base fs_fs fs_util wc/);
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
my $cppflags = '@CPPFLAGS@';
@@ -90,7 +90,7 @@
chomp $apr_shlib_path_var;
-@@ -46,9 +42,9 @@
+@@ -48,9 +44,9 @@
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
@@ -98,7 +98,15 @@
+ LIBS => [join(' ', "[EMAIL PROTECTED]@/lib",
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
- @ldmodules, '-lsvn_swig_perl-1',
-+ '-lsvn_swig_perl-1', @ldmodules, @ldmodules, @ldmodules,
@ldmodules, $apr_ldflags,
++ '-lsvn_swig_perl-1', @ldmodules, @ldmodules, @ldmodules,
@ldmodules, @ldmodules, @ldmodules, '-lsvn_swig_perl-1', $apr_ldflags,
`$swig -perl -ldflags`)],
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
);
+@@ -79,6 +75,7 @@
+ MAKEFILE=> "Makefile.$_",
+ NAME => "SVN::_".perlish($_),
+ C => ["svn_$_.c"],
++ OBJECT => "svn_$_.o core.o"
+ );
+ }
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
