git: 24114c15d5e7 - main - sysutils/nut*: Fix arm build

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Cy Schubert <cy_at_FreeBSD.org>
Date: Fri, 16 Feb 2024 13:50:17 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=24114c15d5e7e3c9d1428460ca05a7067afa09d6

commit 24114c15d5e7e3c9d1428460ca05a7067afa09d6
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-02-16 13:43:46 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-02-16 13:50:03 +0000

    sysutils/nut*: Fix arm build
    
    Fix arm build by removing FREEIPMI from arm
    
    PR:             277089
    MFH:            2024Q1
---
 sysutils/nut-devel/Makefile | 12 ++++++++----
 sysutils/nut/Makefile       | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 85cb9451fefe..332d843ae336 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -39,10 +39,14 @@ CGIDIR_REL?=	${CGIDIR:S,^${PREFIX}/,,}
 PLIST_SUB+=	CGIDIR="${CGIDIR_REL}"
 PLIST_SUB+=	CGIETCDIR="etc/nut/"
 
-OPTIONS_DEFAULT=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL
-OPTIONS_DEFAULT_armv6=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
-OPTIONS_DEFAULT_armv7=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
-OPTIONS_DEFAULT_armv64=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
+OPTIONS_DEFAULT=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
+OPTIONS_DEFAULT_amd64=	FREEIPMI
+OPTIONS_DEFAULT_i386=	FREEIPMI
+OPTIONS_DEFAULT_powerpc=	FREEIPMI
+OPTIONS_DEFAULT_powerpc64=	FREEIPMI
+OPTIONS_DEFAULT_powerpc64le=	FREEIPMI
+OPTIONS_DEFAULT_riscv64=	FREEIPMI
+OPTIONS_DEFAULT_riscv64sf=	FREEIPMI
 OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV
 OPTIONS_SINGLE=	SSL
 OPTIONS_SINGLE_SSL=	SSL_OFF OPENSSL NSS
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 8792df342507..d93528170746 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -30,10 +30,14 @@ CGIDIR_REL?=	${CGIDIR:S,^${PREFIX}/,,}
 PLIST_SUB+=	CGIDIR="${CGIDIR_REL}"
 PLIST_SUB+=	CGIETCDIR="etc/nut/"
 
-OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL
-OPTIONS_DEFAULT_armv6=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
-OPTIONS_DEFAULT_armv7=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
-OPTIONS_DEFAULT_armv64=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
+OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
+OPTIONS_DEFAULT_amd64=	FREEIPMI
+OPTIONS_DEFAULT_i386=	FREEIPMI
+OPTIONS_DEFAULT_powerpc=	FREEIPMI
+OPTIONS_DEFAULT_powerpc64=	FREEIPMI
+OPTIONS_DEFAULT_powerpc64le=	FREEIPMI
+OPTIONS_DEFAULT_riscv64=	FREEIPMI
+OPTIONS_DEFAULT_riscv64sf=	FREEIPMI
 OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV
 OPTIONS_SINGLE=	IPMI SSL
 OPTIONS_SINGLE_SSL=	SSL_OFF OPENSSL NSS