From 24114c15d5e7e3c9d1428460ca05a7067afa09d6 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Fri, 16 Feb 2024 05:43:46 -0800 Subject: [PATCH] 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 85cb9451fefe9..332d843ae3367 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 8792df3425074..d935281707460 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