Author: svn-role
Date: Sat Jan 18 04:04:18 2014
New Revision: 1559317
URL: http://svn.apache.org/r1559317
Log:
Merge r1559009 from trunk:
* r1559009
Fix swig-pl when built with --enable-sqlite-compatibility-version
Justification:
Build system should work.
Votes:
+1: breser
+0: rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/swig/perl/native/Makefile.PL.in
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1559009
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1559317&r1=1559316&r2=1559317&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Jan 18 04:04:18 2014
@@ -291,11 +291,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1559009
- Fix swig-pl when built with --enable-sqlite-compatibility-version
- Justification:
- Build system should work.
- Votes:
- +1: breser
- +0: rhuijben
Modified:
subversion/branches/1.8.x/subversion/bindings/swig/perl/native/Makefile.PL.in
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/swig/perl/native/Makefile.PL.in?rev=1559317&r1=1559316&r2=1559317&view=diff
==============================================================================
---
subversion/branches/1.8.x/subversion/bindings/swig/perl/native/Makefile.PL.in
(original)
+++
subversion/branches/1.8.x/subversion/bindings/swig/perl/native/Makefile.PL.in
Sat Jan 18 04:04:18 2014
@@ -45,10 +45,17 @@ my @ldpaths = (abs_path($swig_builddir)
my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
-my $cppflags = '@CPPFLAGS@';
-my $cflags = '@CFLAGS@';
+my $cppflags = <<'EOT';
+@CPPFLAGS@
+EOT
+my $cflags = <<'EOT';
+@CFLAGS@
+EOT
my $includes = '@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@';
+chomp($cppflags);
+chomp($cflags);
+
# Avoid this bug in SWIG:
#
https://sourceforge.net/tracker/?func=detail&aid=3571361&group_id=1645&atid=101645
# SWIG is using C++ style comments in an extern "C" code.
