[subversion] change cflags in Makefile.PL to work with Perl 5.14.1

Marcela Mašláňová mmaslano at fedoraproject.org
Fri Jul 1 17:20:43 UTC 2011


commit 5d570fa978dc1d7832b0c2f6b0075fcb41f2da8b
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Fri Jul 1 19:18:28 2011 +0200

    change cflags in Makefile.PL to work with Perl 5.14.1

 subversion-MakeMaker.patch |   12 ++++++++++++
 subversion.spec            |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/subversion-MakeMaker.patch b/subversion-MakeMaker.patch
new file mode 100644
index 0000000..e9f7d6b
--- /dev/null
+++ b/subversion-MakeMaker.patch
@@ -0,0 +1,12 @@
+diff -up subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.eemm subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in
+--- subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.eemm	2011-07-01 17:56:05.861063423 +0200
++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in	2011-07-01 17:56:28.675942207 +0200
+@@ -43,7 +43,7 @@ chomp $apr_shlib_path_var;
+ my %config = (
+     ABSTRACT => 'Perl bindings for Subversion',
+     DEFINE => $cppflags,
+-    CCFLAGS => $cflags,
++    CCFLAGS => $Config{ccflags},
+     INC  => join(' ',$apr_cflags, $apu_cflags, 
+                  " -I$swig_srcdir/perl/libsvn_swig_perl",
+                  " -I$svnlib_srcdir/include",
diff --git a/subversion.spec b/subversion.spec
index 6246e0a..c2cc239 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -34,6 +34,7 @@ Patch3: subversion-1.6.1-rpath.patch
 Patch6: subversion-1.6.11-pie.patch
 Patch8: subversion-1.6.6-kwallet.patch
 Patch9: subversion-1.6.12-disable-client-test.patch
+Patch10: subversion-MakeMaker.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@@ -170,6 +171,7 @@ cd ../../..
 %patch6 -p1 -b .pie
 %patch8 -p1 -b .kwallet
 %patch9 -p1 -b .disable-client-test
+%patch10 -p1 -b .eemm
 
 sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
         contrib/client-side/svn2cl/svn2cl.sh
@@ -430,6 +432,7 @@ fi
 %changelog
 * Wed Jun 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.6.17-2
 - Perl mass rebuild
+- change cflags in Makefile.PL to work with Perl 5.14.1
 
 * Thu Jun  2 2011 Joe Orton <jorton at redhat.com> - 1.6.17-1
 - update to 1.6.17 (#709952)


More information about the scm-commits mailing list