|
From: <ai...@us...> - 2014-01-15 02:32:42
|
Revision: 12940
http://sourceforge.net/p/plplot/code/12940
Author: airwin
Date: 2014-01-15 02:32:38 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
Apply patch to swig-2.0.11 to allow it to support octave-3.8.0.
Tested by Alan W. Irwin <ai...@us...> on Linux by
building and installing the patched swig-2.0.11 using epa_build with
the -DBUILD_THE_BUILD_TOOLS=ON option. That installed result was
then tested (with an ordinary epa_build of plplot_lite). Good results
were obtained for a build and install of PLplot, and the test_diff_psc
target in the build tree generated good results for Java, Python,
Octave, and Lua (our 4 swig-generated bindings).
Modified Paths:
--------------
trunk/cmake/epa_build/swig/CMakeLists.txt
Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt 2014-01-15 02:07:27 UTC (rev 12939)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2014-01-15 02:32:38 UTC (rev 12940)
@@ -68,8 +68,18 @@
DEPENDS ${dependencies_targets}
URL ${URL}
URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+ PATCH_COMMAND ""
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
BUILD_IN_SOURCE OFF
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
)
+
+add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
+ COMMAND ${CMAKE_COMMAND} -E echo
+ "Provide swig support for octave-3.8.0"
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
+ APPEND
+ )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|