Date: Wed, 11 Dec 2024 17:34:11 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f26a053fe016 - main - security/libhydrogen: disable march=native, fixing build on non-amd64 / non-x86 Message-ID: <202412111734.4BBHYBwV029232@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f26a053fe016f254dbf07f6d311a41b93d446862 commit f26a053fe016f254dbf07f6d311a41b93d446862 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2024-12-11 12:29:02 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2024-12-11 17:29:05 +0000 security/libhydrogen: disable march=native, fixing build on non-amd64 / non-x86 --- security/libhydrogen/Makefile | 1 + security/libhydrogen/files/patch-CMakeLists.txt | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/security/libhydrogen/Makefile b/security/libhydrogen/Makefile index 0a4b7110e4b3..21d1bf578eec 100644 --- a/security/libhydrogen/Makefile +++ b/security/libhydrogen/Makefile @@ -1,5 +1,6 @@ PORTNAME= libhydrogen PORTVERSION= 0.0.0.g20240509 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= sunpoet@FreeBSD.org diff --git a/security/libhydrogen/files/patch-CMakeLists.txt b/security/libhydrogen/files/patch-CMakeLists.txt index ea713881a2a4..c5a4a0d946a6 100644 --- a/security/libhydrogen/files/patch-CMakeLists.txt +++ b/security/libhydrogen/files/patch-CMakeLists.txt @@ -1,6 +1,18 @@ --- CMakeLists.txt.orig 2024-05-09 19:42:48 UTC +++ CMakeLists.txt -@@ -89,8 +89,9 @@ set(compile_options +@@ -39,11 +39,6 @@ set(arduino_files "library.properties") + + # Compile options + +-get_setting(target_arch STRING "Target system architecture (fed to the compiler's -march=XXX).") +-if(NOT target_arch AND NOT CMAKE_CROSSCOMPILING) +- set(target_arch native) +-endif() +- + get_setting(target_device STRING "Target device identifier (defines HYDRO_TARGET_DEVICE_XXX).") + + set(compile_options +@@ -89,8 +84,9 @@ set(compile_options # Main library @@ -11,7 +23,7 @@ target_sources("${PROJECT_NAME}" PRIVATE ${source_files}) -@@ -100,11 +101,21 @@ target_compile_options("${PROJECT_NAME}" PRIVATE ${com +@@ -100,11 +96,21 @@ target_compile_options("${PROJECT_NAME}" PRIVATE ${com target_compile_options("${PROJECT_NAME}" PRIVATE ${compile_options})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412111734.4BBHYBwV029232>