svn commit: r1566500 - in /subversion/branches/1.8.x: ./ Makefile.in STATUS build.conf configure.ac

[sv...@apache.org]

Author: svn-role
Date: Mon Feb 10 04:04:51 2014
New Revision: 1566500

URL: http://svn.apache.org/r1566500
Log:
Merge r1535610 from trunk:

 * r1535610
   Filter out -no-cpp-precomp from flags passed to SWIG.
   Justification:
     Fixing swig bindings on OS X when used with the majority of the APR
     versions that incorrectly include this in their --cppflags output.
   Votes:
     +1: breser, philip, brane
     +0: rhuijben (looks good, untested)

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/Makefile.in
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/build.conf
    subversion/branches/1.8.x/configure.ac   (contents, props changed)

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1535610

Modified: subversion/branches/1.8.x/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/Makefile.in?rev=1566500&r1=1566499&r2=1566500&view=diff
==============================================================================
--- subversion/branches/1.8.x/Makefile.in (original)
+++ subversion/branches/1.8.x/Makefile.in Mon Feb 10 04:04:51 2014
@@ -177,6 +177,7 @@ CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS
 CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
 SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
+SWIG_CPPFLAGS = @SWIG_CPPFLAGS@ $(EXTRA_CPPFLAGS)
 
 COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
 COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1566500&r1=1566499&r2=1566500&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Feb 10 04:04:51 2014
@@ -205,12 +205,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1535610
-   Filter out -no-cpp-precomp from flags passed to SWIG.
-   Justification:
-     Fixing swig bindings on OS X when used with the majority of the APR
-     versions that incorrectly include this in their --cppflags output.
-   Votes:
-     +1: breser, philip, brane
-     +0: rhuijben (looks good, untested)

Modified: subversion/branches/1.8.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build.conf?rev=1566500&r1=1566499&r2=1566500&view=diff
==============================================================================
--- subversion/branches/1.8.x/build.conf (original)
+++ subversion/branches/1.8.x/build.conf Mon Feb 10 04:04:51 2014
@@ -71,9 +71,9 @@ test-scripts =
 
 bdb-test-scripts =
 
-swig-python-opts = $(CPPFLAGS) -python -classic
-swig-perl-opts = $(CPPFLAGS) -perl -nopm -noproxy
-swig-ruby-opts = $(CPPFLAGS) -ruby
+swig-python-opts = $(SWIG_CPPFLAGS) -python -classic
+swig-perl-opts = $(SWIG_CPPFLAGS) -perl -nopm -noproxy
+swig-ruby-opts = $(SWIG_CPPFLAGS) -ruby
 swig-languages = python perl ruby
 swig-dirs = 
         subversion/bindings/swig/python

Modified: subversion/branches/1.8.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/configure.ac?rev=1566500&r1=1566499&r2=1566500&view=diff
==============================================================================
--- subversion/branches/1.8.x/configure.ac (original)
+++ subversion/branches/1.8.x/configure.ac Mon Feb 10 04:04:51 2014
@@ -1443,6 +1443,11 @@ if test "$CC" = "clang"; then
   SVN_STRIP_FLAG(CPPFLAGS, [-no-cpp-precomp ])
 fi
 
+# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
+SWIG_CPPFLAGS="$CPPFLAGS"
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ])
+AC_SUBST([SWIG_CPPFLAGS])
+
 dnl Since this is used only on Unix-y systems, define the path separator as '/'
 AC_DEFINE_UNQUOTED(SVN_PATH_LOCAL_SEPARATOR, '/',
         [Defined to be the path separator used on your local filesystem])

Propchange: subversion/branches/1.8.x/configure.ac
------------------------------------------------------------------------------
  Merged /subversion/trunk/configure.ac:r1535610