* [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.2-semaphore.patch 0.9.2-tests.patch
@ 2012-06-20 23:11 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2012-06-20 23:11 UTC (permalink / raw
To: gentoo-commits
bicatali 12/06/20 23:11:51
Modified: 0.9.2-tests.patch
Added: 0.9.2-semaphore.patch
Log:
Fix for newer netcdf (bug #421213), fix conditional tests and add a patch to link posix semaphore when openmp is not set
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-lang/gdl/files/0.9.2-tests.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-tests.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-tests.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-tests.patch?r1=1.1&r2=1.2
Index: 0.9.2-tests.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/files/0.9.2-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0.9.2-tests.patch 27 Dec 2011 08:01:36 -0000 1.1
+++ 0.9.2-tests.patch 20 Jun 2012 23:11:51 -0000 1.2
@@ -9,7 +9,7 @@
execl(\"${BASE_BINARY}/src/gdl\",\"-quiet\",\"-e\",v[1],(char*)0);
}
")
-@@ -21,10 +22,117 @@
+@@ -21,10 +22,123 @@
add_library(test_ce SHARED EXCLUDE_FROM_ALL libtest_ce.cpp)
add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test DEPENDS launchtest test_ce)
get_target_property(LAUNCHTESTLOCATION launchtest LOCATION)
@@ -38,16 +38,18 @@
+endif(X11)
+add_test(test_bug_3033108.pro ${LAUNCHTESTLOCATION} test_bug_3033108.pro)
+add_test(test_bug_3054361.pro ${LAUNCHTESTLOCATION} test_bug_3054361.pro)
-+add_test(test_bug_3055720.pro ${LAUNCHTESTLOCATION} test_bug_3055720.pro)
-+add_test(test_bug_3057511.pro ${LAUNCHTESTLOCATION} test_bug_3057511.pro)
-+add_test(test_bug_3057520.pro ${LAUNCHTESTLOCATION} test_bug_3057520.pro)
-+add_test(test_bug_3061072.pro ${LAUNCHTESTLOCATION} test_bug_3061072.pro)
++iF(NETCDF)
++ add_test(test_bug_3055720.pro ${LAUNCHTESTLOCATION} test_bug_3055720.pro)
++ add_test(test_bug_3057511.pro ${LAUNCHTESTLOCATION} test_bug_3057511.pro)
++ add_test(test_bug_3057520.pro ${LAUNCHTESTLOCATION} test_bug_3057520.pro)
++ add_test(test_bug_3061072.pro ${LAUNCHTESTLOCATION} test_bug_3061072.pro)
++ add_test(test_bug_3100945.pro ${LAUNCHTESTLOCATION} test_bug_3100945.pro)
++endif(NETCDF)
+add_test(test_bug_3081887.pro ${LAUNCHTESTLOCATION} test_bug_3081887.pro)
+add_test(test_bug_3085858.pro ${LAUNCHTESTLOCATION} test_bug_3085858.pro)
+add_test(test_bug_3086851.pro ${LAUNCHTESTLOCATION} test_bug_3086851.pro)
+add_test(test_bug_3091599.pro ${LAUNCHTESTLOCATION} test_bug_3091599.pro)
+add_test(test_bug_3091610.pro ${LAUNCHTESTLOCATION} test_bug_3091610.pro)
-+add_test(test_bug_3100945.pro ${LAUNCHTESTLOCATION} test_bug_3100945.pro)
+add_test(test_bug_3104209.pro ${LAUNCHTESTLOCATION} test_bug_3104209.pro)
+add_test(test_bug_3104214.pro ${LAUNCHTESTLOCATION} test_bug_3104214.pro)
+add_test(test_bug_3104326.pro ${LAUNCHTESTLOCATION} test_bug_3104326.pro)
@@ -66,11 +68,15 @@
+add_test(test_bug_3298378.pro ${LAUNCHTESTLOCATION} test_bug_3298378.pro)
+add_test(test_bug_3300626.pro ${LAUNCHTESTLOCATION} test_bug_3300626.pro)
+add_test(test_bug_3313522.pro ${LAUNCHTESTLOCATION} test_bug_3313522.pro)
-+add_test(test_bug_3376577.pro ${LAUNCHTESTLOCATION} test_bug_3376577.pro)
++if(MAGICK)
++ add_test(test_bug_3376577.pro ${LAUNCHTESTLOCATION} test_bug_3376577.pro)
++endif(MAGICK)
+add_test(test_ce.pro ${LAUNCHTESTLOCATION} test_ce.pro)
+add_test(test_clip.pro ${LAUNCHTESTLOCATION} test_clip.pro)
+add_test(test_common.pro ${LAUNCHTESTLOCATION} test_common.pro)
-+add_test(test_constants.pro ${LAUNCHTESTLOCATION} test_constants.pro)
++if(UDUNITS)
++ add_test(test_constants.pro ${LAUNCHTESTLOCATION} test_constants.pro)
++endif(UDUNITS)
+add_test(test_correlate.pro ${LAUNCHTESTLOCATION} test_correlate.pro)
+add_test(test_deriv.pro ${LAUNCHTESTLOCATION} test_deriv.pro)
+add_test(test_device.pro ${LAUNCHTESTLOCATION} test_device.pro)
1.1 dev-lang/gdl/files/0.9.2-semaphore.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-semaphore.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-semaphore.patch?rev=1.1&content-type=text/plain
Index: 0.9.2-semaphore.patch
===================================================================
--- gdl-0.9.2/CMakeLists.txt 2011-11-06 22:39:45.000000000 +0000
+++ gdl-0.9.2/CMakeLists.txt.new 2012-06-21 00:02:42.000000000 +0100
@@ -217,6 +217,19 @@
add_definitions(${OpenMP_CXX_FLAGS})
set(LIBRARIES ${LIBRARIES} ${OpenMP_CXX_FLAGS})
endif(OPENMP_FOUND)
+else(OPENMP)
+ # we need to define those semaphore posix symbols, do it with threads libs
+ find_package(Threads)
+ if(THREADS_FOUND)
+ set(LIBRARIES ${LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ else(THREADS_FOUND)
+ check_library_exists(rt sem_unlink "" HAVE_RT)
+ if(HAVE_RT)
+ set(LIBRARIES ${LIBRARIES} rt)
+ else(HAVE_RT)
+ message(FATAL_ERROR "Missing a POSIX semaphore symbols (rt or threads).\n")
+ endif(HAVE_RT)
+ endif(THREADS_FOUND)
endif(OPENMP)
# GSL MANDATORY
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-20 23:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-20 23:11 [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.2-semaphore.patch 0.9.2-tests.patch Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox