Skip to content

Commit 7c16c38

Browse files
committed
configure.ac: add adapter dependency from sys/mman.h
The adapter's driver that require the header file sys/mman.h should check for it and don't compile if it is not present. Add the check for sys/mman.h in configure.ac and prevent the build of the adapter's driver that depend on it. Change-Id: If0a518069e8fef9b41a67b633ec20e2f142a8b14 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/9159 Tested-by: jenkins
1 parent 910e6ba commit 7c16c38

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

configure.ac

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ AC_CHECK_HEADERS([netdb.h])
6969
AC_CHECK_HEADERS([poll.h])
7070
AC_CHECK_HEADERS([strings.h])
7171
AC_CHECK_HEADERS([sys/ioctl.h])
72+
AC_CHECK_HEADERS([sys/mman.h])
7273
AC_CHECK_HEADERS([sys/param.h])
7374
AC_CHECK_HEADERS([sys/select.h])
7475
AC_CHECK_HEADERS([sys/stat.h])
@@ -632,12 +633,14 @@ PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libu
632633
PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi])
633634
PROCESS_ADAPTERS([LIBFTDI_USB1_ADAPTERS], ["x$use_libftdi" = "xyes" -a "x$use_libusb1" = "xyes"], [libftdi and libusb-1.x])
634635
PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [Linux libgpiod])
635-
PROCESS_ADAPTERS([DMEM_ADAPTER], ["x$is_linux" = "xyes"], [Linux /dev/mem])
636+
PROCESS_ADAPTERS([DMEM_ADAPTER], ["x$is_linux" = "xyes" -a "x$ac_cv_header_sys_mman_h" = "xyes"], [Linux /dev/mem])
636637
PROCESS_ADAPTERS([SYSFSGPIO_ADAPTER], ["x$is_linux" = "xyes"], [Linux sysfs])
637638
PROCESS_ADAPTERS([REMOTE_BITBANG_ADAPTER], [true], [unused])
638639
PROCESS_ADAPTERS([CMSIS_DAP_TCP_ADAPTER], [true], [unused])
639640
PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libjaylink-0.2])
640-
PROCESS_ADAPTERS([XVC_ADAPTERS], ["x$is_linux" = "xyes" -a "x$ac_cv_header_linux_pci_h" = "xyes"], [Linux build])
641+
PROCESS_ADAPTERS([XVC_ADAPTERS],
642+
["x$is_linux" = "xyes" -a "x$ac_cv_header_linux_pci_h" = "xyes" -a "x$ac_cv_header_sys_mman_h" = "xyes"],
643+
[Linux build with headers linux/pci.h and sys/mman.h])
641644
PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
642645
[internal error: validation should happen beforehand])
643646
PROCESS_ADAPTERS([PARALLEL_PORT_ADAPTER], [true], [unused])
@@ -649,8 +652,8 @@ PROCESS_ADAPTERS([JTAG_VPI_ADAPTER], [true], [unused])
649652
PROCESS_ADAPTERS([RSHIM_ADAPTER], ["x$can_build_rshim" = "xyes"],
650653
[internal error: validation should happen beforehand])
651654
PROCESS_ADAPTERS([AMTJTAGACCEL_ADAPTER], [true], [unused])
652-
PROCESS_ADAPTERS([HOST_ARM_BITBANG_ADAPTERS], [true], [unused])
653-
PROCESS_ADAPTERS([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS], [true], [unused])
655+
PROCESS_ADAPTERS([HOST_ARM_BITBANG_ADAPTERS], ["x$ac_cv_header_sys_mman_h" = "xyes"], [header sys/mman.h])
656+
PROCESS_ADAPTERS([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS], ["x$ac_cv_header_sys_mman_h" = "xyes"], [header sys/mman.h])
654657
PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused])
655658

656659
AS_IF([test "x$enable_linuxgpiod" != "xno"], [

0 commit comments

Comments
 (0)