Re: 6540ac118473 - main - modules: gpioaei only on ACPI-supporting archs

From: Ravi Pokala <rpokala_at_freebsd.org>
Date: Sat, 02 Nov 2024 01:34:42 UTC
Hi Colin,

This seems to have broken arm64.LINT-FDT:

================================================================
% less _.arm64.LINT-FDT
...
--------------------------------------------------------------
>>> stage 3.1: building everything
--------------------------------------------------------------
In file included from /usr/home/rpokala/freebsd/src/clean-main/sys/dev/gpio//gpioaei.c:37:
/usr/home/rpokala/freebsd/src/clean-main/sys/dev/acpica/acpivar.h:34:10: fatal error: 'acpi_if.h' file not found
   34 | #include "acpi_if.h"
      |          ^~~~~~~~~~~
1 error generated.
*** [gpioaei.o] Error code 1

make[8]: stopped making "all" in /usr/home/rpokala/freebsd/src/clean-main/sys/modules/gpio/gpioaei
================================================================

-Ravi (rpokala@)

-----Original Message-----
From: <owner-src-committers@freebsd.org <mailto:owner-src-committers@freebsd.org>> on behalf of Colin Percival <cperciva@FreeBSD.org <mailto:cperciva@FreeBSD.org>>
Date: Thursday, October 31, 2024 at 15:47
To: <src-committers@FreeBSD.org <mailto:src-committers@FreeBSD.org>>, <dev-commits-src-all@FreeBSD.org <mailto:dev-commits-src-all@FreeBSD.org>>, <dev-commits-src-main@FreeBSD.org <mailto:dev-commits-src-main@FreeBSD.org>>
Subject: git: 6540ac118473 - main - modules: gpioaei only on ACPI-supporting archs


The branch main has been updated by cperciva:


URL: https://cgit.FreeBSD.org/src/commit/?id=6540ac118473dde29cb02f786c79c64f73834ca1 <https://cgit.FreeBSD.org/src/commit/?id=6540ac118473dde29cb02f786c79c64f73834ca1>


commit 6540ac118473dde29cb02f786c79c64f73834ca1
Author: Colin Percival <cperciva@FreeBSD.org <mailto:cperciva@FreeBSD.org>>
AuthorDate: 2024-10-31 22:45:03 +0000
Commit: Colin Percival <cperciva@FreeBSD.org <mailto:cperciva@FreeBSD.org>>
CommitDate: 2024-10-31 22:45:03 +0000


modules: gpioaei only on ACPI-supporting archs


Fixes: 9709bda03cd0 ("GPIO: Add ACPI _AEI support")
Pointy-hat to: cperciva
Sponsored by: Amazon
---
sys/modules/gpio/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)


diff --git a/sys/modules/gpio/Makefile b/sys/modules/gpio/Makefile
index 1d7f69f1836d..66090b1393bf 100644
--- a/sys/modules/gpio/Makefile
+++ b/sys/modules/gpio/Makefile
@@ -24,10 +24,14 @@
# SUCH DAMAGE.
#


-SUBDIR = gpioaei gpiobus gpioiic gpioled gpiospi gpioths
+SUBDIR = gpiobus gpioiic gpioled gpiospi gpioths


.if !empty(OPT_FDT)
SUBDIR += gpiokeys gpiopps
.endif


+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+SUBDIR += gpioaei
+.endif
+
.include <bsd.subdir.mk>