jlec 15/05/07 15:33:32
Added: 0.9.4-plplot.patch 0.9.4-python2.patch
0.9.5-antlr.patch 0.9.5-png.patch 0.9.5-proj4.patch
0.9.5-testsuite.patch
Log:
Version Bump; fix compatibility with latest plplot, bug #547380; fix python
support bug #530774
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1 dev-lang/gdl/files/0.9.4-plplot.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.4-plplot.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.4-plplot.patch?rev=1.1&content-type=text/plain
Index: 0.9.4-plplot.patch
===================================================================
CMakeModules/FindPlplot.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeModules/FindPlplot.cmake b/CMakeModules/FindPlplot.cmake
index a503f8c..cdaeb24 100644
--- a/CMakeModules/FindPlplot.cmake
+++ b/CMakeModules/FindPlplot.cmake
@@ -9,8 +9,8 @@
#
-find_library(PLPLOT_LIBRARY NAMES plplotd)
-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
+find_library(PLPLOT_LIBRARY NAMES plplotd plplot)
+find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd plplotcxx)
set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
include(FindPackageHandleStandardArgs)
1.1 dev-lang/gdl/files/0.9.4-python2.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.4-python2.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.4-python2.patch?rev=1.1&content-type=text/plain
Index: 0.9.4-python2.patch
===================================================================
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fda8ee..e2170b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -615,8 +615,8 @@ if(PYTHON OR PYTHON_MODULE)
else()
set(PythonLibs_FIND_VERSION 2)
endif()
- find_package(PythonLibs)
include(FindPythonInterp)
+ find_package(PythonLibs)
endif()
set(USE_PYTHON ${PYTHONLIBS_FOUND})
if(PYTHONLIBS_FOUND)
1.1 dev-lang/gdl/files/0.9.5-antlr.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-antlr.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-antlr.patch?rev=1.1&content-type=text/plain
Index: 0.9.5-antlr.patch
===================================================================
CMakeLists.txt | 14 +++++++++++---
CMakeModules/FindANTLR.cmake | 11 +++++++++++
src/CMakeLists.txt | 18 +++++++++++-------
3 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 407e39a..c4b3278 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,8 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory
tree")
set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data directory
relative to CMAKE_INSTALL_PREFIX")
+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
# check for 64-bit OS
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
@@ -174,9 +176,15 @@ check_library_exists(m nexttoward "" HAVE_NEXTTOWARD)
# mpi
check_include_file(mpi.h HAVE_MPI_H)
-# SA: whithout it compilation of antlr fails if there's a conflicting
-# version of antlr in system-wide directories
-include_directories(src)
+if(BUNDLED_ANTLR)
+ # SA: whithout it compilation of antlr fails if there's a conflicting
+ # version of antlr in system-wide directories
+ include_directories(src)
+else(BUNDLED_ANTLR)
+ find_package(ANTLR QUIET)
+ set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
+ include_directories(${ANTLR_INCLUDE_DIR})
+endif(BUNDLED_ANTLR)
if(WIN32 AND NOT CYGWIN)
# For Win32 find Pdcureses instead of (N)Curses
diff --git a/CMakeModules/FindANTLR.cmake b/CMakeModules/FindANTLR.cmake
new file mode 100644
index 0000000..b61cc5b
--- /dev/null
+++ b/CMakeModules/FindANTLR.cmake
@@ -0,0 +1,11 @@
+
+
+find_library(ANTLR_LIBRARIES NAMES antlr)
+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES
ANTLR_INCLUDE_DIR)
+
+mark_as_advanced(
+ANTLR_LIBRARIES
+ANTLR_INCLUDE_DIR
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f7ffec..776a1fd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -262,9 +262,8 @@ widget.cpp
widget.hpp
)
-add_subdirectory(antlr)
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR})
link_directories(${LINK_DIRECTORIES})
if(PYTHON_MODULE) #libgdl
@@ -275,11 +274,16 @@ else(PYTHON_MODULE) #gdl
add_executable(gdl ${SOURCES})
endif(PYTHON_MODULE)
-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-target_link_libraries(gdl antlr) # link antlr against gdl
-if (MINGW)
-target_link_libraries(gdl ws2_32)
-endif (MINGW)
+if(BUNDLED_ANTLR)
+ add_subdirectory(antlr)
+ include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
+ add_dependencies(gdl antlr) # be sure that antlr is built before gdl
+ target_link_libraries(gdl antlr) # link antlr against gdl
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
+ endif (MINGW)
+endif(BUNDLED_ANTLR)
+
target_link_libraries(gdl ${LIBRARIES})
add_definitions(-DHAVE_CONFIG_H)
1.1 dev-lang/gdl/files/0.9.5-png.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-png.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-png.patch?rev=1.1&content-type=text/plain
Index: 0.9.5-png.patch
===================================================================
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 407e39a..f24a087 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,7 +270,6 @@ if(PNGLIB)
set(USE_PNGLIB ${PNG_FOUND})
if(PNG_FOUND)
set(LIBRARIES ${LIBRARIES} ${PNG_LIBRARIES})
- set(LINK_DIRECTORIES ${LINK_DIRECTORIES} ${PNG_LIBRARY_DIRS})
include_directories(${PNG_INCLUDE_DIRS})
else(PNG_FOUND)
message(FATAL_ERROR "libpng is required but was not found.\n"
1.1 dev-lang/gdl/files/0.9.5-proj4.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-proj4.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-proj4.patch?rev=1.1&content-type=text/plain
Index: 0.9.5-proj4.patch
===================================================================
CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4b3278..f9ed49d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -637,17 +637,17 @@ if(LIBPROJ4)
if(LIBPROJ4_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES}
${GSL_LIBRARIES} m)
- check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init ""
USE_LIBPROJ4_NEW)
- if(USE_LIBPROJ4_NEW)
+ check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init ""
USE_LIBPROJ4)
+ if(USE_LIBPROJ4)
# check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init ""
USE_LIBPROJ4)
# if(USE_LIBPROJ4)
# define USE_LIB_PROJ4 in any case
set(USE_LIBPROJ4 1)
- else(USE_LIBPROJ4_NEW)
- check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init
"" USE_LIBPROJ4)
- if(NOT USE_LIBPROJ4)
+ else(USE_LIBPROJ4)
+ check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init
"" USE_LIBPROJ4_NEW)
+ if(NOT USE_LIBPROJ4_NEW)
# else(USE_LIBPROJ4)
# check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init ""
USE_LIBPROJ4_NEW)
# if(NOT USE_LIBPROJ4_NEW)
@@ -656,8 +656,8 @@ if(LIBPROJ4)
"Use -DLIBPROJ4DIR=DIR to specify the Libproj4
directory tree.\n"
"Use -DLIBPRJ4=OFF to not use it.")
- endif(NOT USE_LIBPROJ4)
- endif(USE_LIBPROJ4_NEW)
+ endif(NOT USE_LIBPROJ4_NEW)
+ endif(USE_LIBPROJ4)
# endif(NOT USE_LIBPROJ4_NEW)
# endif(USE_LIBPROJ4)
1.1 dev-lang/gdl/files/0.9.5-testsuite.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-testsuite.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.5-testsuite.patch?rev=1.1&content-type=text/plain
Index: 0.9.5-testsuite.patch
===================================================================
testsuite/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/testsuite/CMakeLists.txt b/testsuite/CMakeLists.txt
index 31506e4..287f352 100644
--- a/testsuite/CMakeLists.txt
+++ b/testsuite/CMakeLists.txt
@@ -47,7 +47,6 @@ file(WRITE ${CMAKE_SOURCE_DIR}/testsuite/launchtest.c
"${LAUNCH}")
add_executable(launchtest EXCLUDE_FROM_ALL
${CMAKE_SOURCE_DIR}/testsuite/launchtest.c)
add_library(test_ce SHARED EXCLUDE_FROM_ALL libtest_ce.cpp)
add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test DEPENDS launchtest
test_ce gdl)
-get_target_property(LAUNCHTESTLOCATION launchtest LOCATION)
execute_process(
COMMAND "fgrep" ".pro" "${BASE_SOURCE}/testsuite/Makefile.am"
COMMAND "awk" "{printf(\"%s;\",$1)}"
