subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1391948 - in /subversion/branches/1.7.x: ./ STATUS subversion/bindings/swig/perl/native/Makefile.PL.in
Date Sun, 30 Sep 2012 04:02:10 GMT
Author: svn-role
Date: Sun Sep 30 04:02:09 2012
New Revision: 1391948

URL: http://svn.apache.org/viewvc?rev=1391948&view=rev
Log:
Merge r1389658 from trunk:

 * r1389658
   Fix the Perl bindings building with newer versions of SWIG.
   Justification:
     Convenience for users using newer verisons of SWIG.
   Votes:
     +1: breser, brane

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/bindings/swig/perl/native/Makefile.PL.in

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1389658

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1391948&r1=1391947&r2=1391948&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sun Sep 30 04:02:09 2012
@@ -139,10 +139,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1389658
-   Fix the Perl bindings building with newer versions of SWIG.
-   Justification:
-     Convenience for users using newer verisons of SWIG.
-   Votes:
-     +1: breser, brane

Modified: subversion/branches/1.7.x/subversion/bindings/swig/perl/native/Makefile.PL.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/perl/native/Makefile.PL.in?rev=1391948&r1=1391947&r2=1391948&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/swig/perl/native/Makefile.PL.in (original)
+++ subversion/branches/1.7.x/subversion/bindings/swig/perl/native/Makefile.PL.in Sun Sep
30 04:02:09 2012
@@ -50,6 +50,11 @@ my $cflags = '@CFLAGS@';
 my $apr_cflags = '@SVN_APR_INCLUDES@';
 my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
 
+# 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.
+$cflags =~ s/-ansi\s+//g;
+
 # According to the log of r7937, the flags guarded by the conditional break
 # the build on FreeBSD if not conditionalized.
 my $apr_ldflags = '@SVN_APR_LIBS@'



Mime
View raw message