svn commit: r1536537 - in /subversion/trunk: Makefile.in build/run_ctypesgen.sh

[br...@apache.org]

Author: breser
Date: Mon Oct 28 21:57:32 2013
New Revision: 1536537

URL: http://svn.apache.org/r1536537
Log:
ctypes-ptyon: Use the CPP detected as part of our configure run rather than
the CPP detected when APR was built.

This fixes building ctypes-python on newer versions of OS X (>= 10.8).  APR
was built with CC=`xcrun --find cc`.  However, that path is dependent upon
the version of Xcode installed, as a result the output of `apr-config --cpp`
may point to a non-existant path.

* Makefile.in
  (CPP): Set a variable we already have been bothering to detect.
  (ctypes-pathon): Pass the CPP variable into the run_ctypesgen.sh script.

* run_ctypesgen.sh
  (cpp): Set from command line argument rather than from apr-config.



Modified:
    subversion/trunk/Makefile.in
    subversion/trunk/build/run_ctypesgen.sh

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1536537&r1=1536536&r2=1536537&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon Oct 28 21:57:32 2013
@@ -108,6 +108,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 
 CC = @CC@
 CXX = @CXX@
+CPP = @CPP@
 EXEEXT = @EXEEXT@
 
 SHELL = @SHELL@
@@ -910,7 +911,7 @@ install-swig-rb-doc:
 
 # ctypes-python make targets
 ctypes-python: local-all
-	$(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)"
+	$(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)" "$(CPP)"
 
 install-ctypes-python: ctypes-python
 	cd $(CTYPES_PYTHON_SRC_DIR); \

Modified: subversion/trunk/build/run_ctypesgen.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_ctypesgen.sh?rev=1536537&r1=1536536&r2=1536537&view=diff
==============================================================================
--- subversion/trunk/build/run_ctypesgen.sh (original)
+++ subversion/trunk/build/run_ctypesgen.sh Mon Oct 28 21:57:32 2013
@@ -36,6 +36,7 @@ abs_builddir="$7"
 svn_libdir="$8"
 apr_config="$9"
 apu_config="${10}"
+cpp="${11}"
 
 cp_relpath="subversion/bindings/ctypes-python"
 output="$cp_relpath/svn_all.py"
@@ -57,7 +58,6 @@ apu_cppflags="`$apu_config --includes`" 
 apu_include_dir="`$apu_config --includedir`"
 apu_ldflags="`$apu_config --ldflags --link-ld`"
 
-cpp="`$apr_config --cpp`"
 ### end
 
 cppflags="$apr_cppflags $apu_cppflags -I$svn_includes"