perl 5.36.0 rebuild

[packages/subversion.git] / subversion-perl.patch

diff --git a/subversion-perl.patch b/subversion-perl.patch
index a5a1d6870462fb123cdc5eee0dc727c1186cf16a..88f23aa5adff1e125dc74cff123c449622513363 100644 (file)
--- a/subversion-perl.patch
+++ b/subversion-perl.patch
@@ -1,40 +1,11 @@
-diff -urN subversion-0.34.0.org/subversion/bindings/swig/perl/Makefile.PL subversion-0.34.0/subversion/bindings/swig/perl/Makefile.PL
---- subversion-0.34.0.org/subversion/bindings/swig/perl/Makefile.PL    2003-12-04 14:17:49.244647569 +0100
-+++ subversion-0.34.0/subversion/bindings/swig/perl/Makefile.PL        2003-12-04 14:19:39.765599240 +0100
-@@ -2,14 +2,17 @@
- use ExtUtils::MakeMaker;
+--- subversion-1.14.2/Makefile.in.orig 2022-07-14 22:54:57.153438576 +0200
++++ subversion-1.14.2/Makefile.in      2022-07-15 16:38:46.332821294 +0200
+@@ -881,7 +881,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
+       ./config.status subversion/bindings/swig/perl/native/Makefile.PL
  
- my @modules = qw/client delta fs ra repos wc/;
-+my @ldpaths = ('../.libs', map {"../../../libsvn_$_/.libs"} (@modules, qw/diff subr/));
- my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
+ $(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
+-      cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
++      cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor
  
- my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config';
- $apr_config = 'apr-config' unless -e $apr_config;
- 
-+my $apr_shlib_path_var = `$apr_config --shlib-path-var`;
- my $apr_cflags = `$apr_config --includes`;
- my $apr_ldflags = `$apr_config --cflags --libs`;
- 
-+chomp $apr_shlib_path_var;
- chomp $apr_cflags;
- chomp $apr_ldflags;
- 
-@@ -19,7 +22,7 @@
-                    ' -I.. -I../../../include -g'),
-     OBJECT => q/$(O_FILES)/,
-     dynamic_lib => {
--      OTHERLDFLAGS => join(' ', $apr_ldflags, '-L/usr/local/lib',
-+      OTHERLDFLAGS => join(' ', $apr_ldflags, (map {"-L$_"} @ldpaths),
-                            @ldmodules, '-lsvn_swig_perl-1',
-                            `swig -perl -ldflags`),
-     },
-@@ -66,6 +69,7 @@
-              (map {"\nsvn_$_.c : ../svn_$_.i ra_plugin.hi ra_reporter.hi delta_editor.hi\n".
-                       "\tswig -c -nopm -perl -I.. -I../../../include $apr_cflags -module SVN::_".main::perlish($_)." -o svn_$_.c ../svn_$_.i\n"}
-              @modules),
--
-+               "\nFULLPERLRUN=$apr_shlib_path_var=",join(':',@ldpaths),
-+               " \$(FULLPERL)\n",
-             );
- }
-
+ # There is a "readlink -f" command on some systems for the same purpose,
+ # but it's not as portable (e.g. Mac OS X doesn't have it).  These should