svn commit: r566874 - in head/science/dakota: . files

[Yuri Victorovich]

Author: yuri
Date: Mon Mar  1 17:55:16 2021
New Revision: 566874
URL: https://svnweb.freebsd.org/changeset/ports/566874

Log:
  science/dakota: Fix build on i386
  
  Reported by:	fallout

Added:
  head/science/dakota/files/patch-packages_external_JEGA_eddy_threads_src_thread.cpp   (contents, props changed)
Modified:
  head/science/dakota/Makefile

Modified: head/science/dakota/Makefile
==============================================================================
--- head/science/dakota/Makefile	Mon Mar  1 17:17:43 2021	(r566873)
+++ head/science/dakota/Makefile	Mon Mar  1 17:55:16 2021	(r566874)
@@ -102,11 +102,16 @@ post-install:
 .endfor
 
 do-test: # from Additional Test Suites @ https://dakota.sandia.gov/content/additional-test-suites (many tests are known to fail)
-	# minimal set of fast-running tests that should NOT FAIL (may DIFF, depending on platform / compiler)
-	cd ${WRKSRC}/test && ./dakota_test.perl
-	# test suite that should PASS on any supported platform (NO DIFF or FAIL)
-	cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=AcceptanceTest
-	# run all Dakota tests active in this build (should PASS or DIFF)
-	cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=dakota_
+	## minimal set of fast-running tests that should NOT FAIL (may DIFF, depending on platform / compiler)
+	#cd ${WRKSRC}/test && ./dakota_test.perl
+	## test suite that should PASS on any supported platform (NO DIFF or FAIL)
+	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=AcceptanceTest
+	## run all Dakota tests active in this build (should PASS or DIFF)
+	#cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=dakota_
+	# Tests should be this way, but this fails:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDAKOTA_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		(cd ${WRKSRC} && ctest -j 4 -L FastTest -LE Diff)
 
 .include <bsd.port.mk>

Added: head/science/dakota/files/patch-packages_external_JEGA_eddy_threads_src_thread.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/dakota/files/patch-packages_external_JEGA_eddy_threads_src_thread.cpp	Mon Mar  1 17:55:16 2021	(r566874)
@@ -0,0 +1,13 @@
+- Fix i386 build.
+
+--- packages/external/JEGA/eddy/threads/src/thread.cpp.orig	2021-03-01 17:15:15 UTC
++++ packages/external/JEGA/eddy/threads/src/thread.cpp
+@@ -152,7 +152,7 @@ thread::sleep(
+     )
+ {
+     struct timespec ts = {
+-		msecs/1000, static_cast<long>((msecs%1000)*1000000)
++		time_t(msecs/1000), static_cast<long>((msecs%1000)*1000000)
+ 		};
+ 
+ #if defined(EDDY_WINDOWS)