Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2013-12-17 01:15:28
|
Revision: 12870
http://sourceforge.net/p/plplot/code/12870
Author: airwin
Date: 2013-12-17 01:15:22 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Set rpath so that when the epa_build version of swig is loaded by the
run-time loader, the epa_build version of libpcre is found.
Modified Paths:
--------------
trunk/cmake/epa_build/swig/CMakeLists.txt
Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt 2013-12-16 23:51:43 UTC (rev 12869)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2013-12-17 01:15:22 UTC (rev 12870)
@@ -68,7 +68,7 @@
DEPENDS ${dependencies_targets}
URL ${URL}
URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
+ 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <arj...@us...> - 2014-02-08 19:09:30
|
Revision: 12984
http://sourceforge.net/p/plplot/code/12984
Author: arjenmarkus
Date: 2014-02-08 19:09:26 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
Add two compile flags to avoid compile errors (regarding the off64_t type and regarding the struct for directory contents)
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-02-08 19:00:24 UTC (rev 12983)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2014-02-08 19:09:26 UTC (rev 12984)
@@ -46,6 +46,7 @@
if(MSYS_PLATFORM)
# Add two MSYS specific flags to avoid compile errors
+ # It is unclear if they have any unexpected effects
set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
else(MSYS_PLATFORM)
set(CFLAGS "$ENV{CFLAGS}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-09 20:46:35
|
Revision: 12989
http://sourceforge.net/p/plplot/code/12989
Author: airwin
Date: 2014-02-09 20:46:30 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
Revert the recent CFLAGS change which has not been comprehensively
tested for this release.
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-02-09 20:41:00 UTC (rev 12988)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2014-02-09 20:46:30 UTC (rev 12989)
@@ -42,12 +42,10 @@
dependencies_targets
EPA_PATH
source_PATH
- )
+ )
if(MSYS_PLATFORM)
- # Add two MSYS specific flags to avoid compile errors
- # It is unclear if they have any unexpected effects
- set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
+ set(CFLAGS "$ENV{CFLAGS}")
else(MSYS_PLATFORM)
set(CFLAGS "$ENV{CFLAGS}")
endif(MSYS_PLATFORM)
@@ -72,7 +70,7 @@
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_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
)
@@ -80,7 +78,7 @@
add_custom_command(
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
- COMMAND ${CMAKE_COMMAND} -E echo
+ 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.
|
|
From: <arj...@us...> - 2014-02-12 08:55:33
|
Revision: 12997
http://sourceforge.net/p/plplot/code/12997
Author: arjenmarkus
Date: 2014-02-12 08:55:30 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
Add the option --with-maximum-compile-warnings=no to avoid errors with gcc 4.8.1 on MinGW/MSYS while building the SWIG target in epa_build.
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-02-11 23:26:27 UTC (rev 12996)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2014-02-12 08:55:30 UTC (rev 12997)
@@ -42,7 +42,7 @@
dependencies_targets
EPA_PATH
source_PATH
- )
+ )
if(MSYS_PLATFORM)
set(CFLAGS "$ENV{CFLAGS}")
@@ -69,8 +69,8 @@
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}
+ 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} --with-maximum-compile-warnings=no
+ 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
)
@@ -78,7 +78,7 @@
add_custom_command(
OUTPUT
${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
- COMMAND ${CMAKE_COMMAND} -E echo
+ 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.
|
Thanks for helping keep SourceForge clean.
X