From 9059621629a4dad0c6a3947919679654065f46a2 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Tue, 26 May 2020 09:15:55 +0000 Subject: [PATCH] lang/io, lang/io-devel: fix build on !x86 While at it, add test target to io-devel. PR: 246225 Submitted by: pkubaj --- lang/io-devel/Makefile | 6 +++++- lang/io-devel/files/extra-patch-CMakeLists.txt | 3 ++- lang/io/Makefile | 2 +- lang/io/files/extra-patch-CMakeLists.txt | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lang/io-devel/Makefile b/lang/io-devel/Makefile index c4de0c81868f..198dff163e26 100644 --- a/lang/io-devel/Makefile +++ b/lang/io-devel/Makefile @@ -31,9 +31,13 @@ CMAKE_ARGS= -DWITHOUT_EERIE:BOOL=ON .include -# 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 diff --git a/lang/io-devel/files/extra-patch-CMakeLists.txt b/lang/io-devel/files/extra-patch-CMakeLists.txt index 8590f9b905e5..19505a831e0f 100644 --- a/lang/io-devel/files/extra-patch-CMakeLists.txt +++ b/lang/io-devel/files/extra-patch-CMakeLists.txt @@ -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) diff --git a/lang/io/Makefile b/lang/io/Makefile index 64ae9494848a..e0c5bc687428 100644 --- a/lang/io/Makefile +++ b/lang/io/Makefile @@ -35,7 +35,7 @@ OPTIONS_SUB= yes .include -# 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 diff --git a/lang/io/files/extra-patch-CMakeLists.txt b/lang/io/files/extra-patch-CMakeLists.txt index 82355e41e7ca..863b4f7256cf 100644 --- a/lang/io/files/extra-patch-CMakeLists.txt +++ b/lang/io/files/extra-patch-CMakeLists.txt @@ -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)