Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 May 2020 09:15:55 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r536598 - in head/lang: io io-devel io-devel/files io/files
Message-ID:  <202005260915.04Q9Ft4x019012@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue May 26 09:15:55 2020
New Revision: 536598
URL: https://svnweb.freebsd.org/changeset/ports/536598

Log:
  lang/io, lang/io-devel: fix build on !x86
  
  While at it, add test target to io-devel.
  
  PR:		246225
  Submitted by:	pkubaj

Modified:
  head/lang/io-devel/Makefile
  head/lang/io-devel/files/extra-patch-CMakeLists.txt
  head/lang/io/Makefile
  head/lang/io/files/extra-patch-CMakeLists.txt

Modified: head/lang/io-devel/Makefile
==============================================================================
--- head/lang/io-devel/Makefile	Tue May 26 09:15:45 2020	(r536597)
+++ head/lang/io-devel/Makefile	Tue May 26 09:15:55 2020	(r536598)
@@ -31,9 +31,13 @@ CMAKE_ARGS=	-DWITHOUT_EERIE:BOOL=ON
 
 .include <bsd.port.pre.mk>
 
-# disable sse on non-x86 archs
+# disable SSE on non-x86 archs
 .if ${ARCH} != amd64 && ${ARCH} != i386
 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-CMakeLists.txt
 .endif
+
+do-test:
+	cd ${BUILD_WRKSRC} && \
+	    ./_build/binaries/io ${WRKSRC}/libs/iovm/tests/correctness/run.io
 
 .include <bsd.port.post.mk>

Modified: head/lang/io-devel/files/extra-patch-CMakeLists.txt
==============================================================================
--- head/lang/io-devel/files/extra-patch-CMakeLists.txt	Tue May 26 09:15:45 2020	(r536597)
+++ head/lang/io-devel/files/extra-patch-CMakeLists.txt	Tue May 26 09:15:55 2020	(r536598)
@@ -1,10 +1,11 @@
 --- CMakeLists.txt.orig	2018-08-07 11:40:49 UTC
 +++ CMakeLists.txt
-@@ -41,7 +41,6 @@ IF(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_C
+@@ -41,7 +41,7 @@ IF(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_C
  	SET(CMAKE_BUILD_TYPE_DebugFast)
  	SET(CMAKE_CXX_FLAGS_DEBUGFAST "-g -O0")
  	SET(CMAKE_C_FLAGS_DEBUGFAST "-g -O0")
 -	SET(CMAKE_C_FLAGS "-msse2")
++	SET(CMAKE_C_FLAGS "-D__SIMD_NO_SIMD__")
  	if(NOT CMAKE_BUILD_TYPE)
  	        SET(CMAKE_BUILD_TYPE "DebugFast")
  	endif(NOT CMAKE_BUILD_TYPE)

Modified: head/lang/io/Makefile
==============================================================================
--- head/lang/io/Makefile	Tue May 26 09:15:45 2020	(r536597)
+++ head/lang/io/Makefile	Tue May 26 09:15:55 2020	(r536598)
@@ -35,7 +35,7 @@ OPTIONS_SUB=	yes
 
 .include <bsd.port.pre.mk>
 
-# disable sse on non-x86 archs
+# disable SSE on non-x86 archs
 .if ${ARCH} != amd64 && ${ARCH} != i386
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-CMakeLists.txt
 .endif

Modified: head/lang/io/files/extra-patch-CMakeLists.txt
==============================================================================
--- head/lang/io/files/extra-patch-CMakeLists.txt	Tue May 26 09:15:45 2020	(r536597)
+++ head/lang/io/files/extra-patch-CMakeLists.txt	Tue May 26 09:15:55 2020	(r536598)
@@ -1,10 +1,11 @@
 --- CMakeLists.txt.orig	2019-04-05 06:24:16 UTC
 +++ CMakeLists.txt
-@@ -39,7 +39,6 @@ IF(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_C
+@@ -39,7 +39,7 @@ IF(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_C
  	SET(CMAKE_BUILD_TYPE_DebugFast)
  	SET(CMAKE_CXX_FLAGS_DEBUGFAST "-g -O0")
  	SET(CMAKE_C_FLAGS_DEBUGFAST "-g -O0")
 -	SET(CMAKE_C_FLAGS "-msse2")
++	SET(CMAKE_C_FLAGS "-D__SIMD_NO_SIMD__")
  	if(NOT CMAKE_BUILD_TYPE)
  	        SET(CMAKE_BUILD_TYPE "DebugFast")
  	endif(NOT CMAKE_BUILD_TYPE)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005260915.04Q9Ft4x019012>