Skip to content

Commit 940b334

Browse files
committed
Possible MacOS build fix
1 parent e8ae951 commit 940b334

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

packages/macos/openocd/build-openocd.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -euo pipefail
55
cd openocd
66
sed -i '' -e 's/@ref{linuxgpiod, linuxgpiod}/@b{linuxgpiod}/g' doc/openocd.texi
77

8+
git apply ../../packages/macos/openocd/parport.diff
9+
810
./bootstrap
911
# See https://github.com/raspberrypi/openocd/issues/30
1012
# ./configure --disable-werror CAPSTONE_CFLAGS="$(pkg-config capstone --cflags | sed s/.capstone\$//)"
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index e48653b215..c44d902d2c 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -63,6 +63,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <features.h>]], [[int v = __GLIBC_
6+
AC_MSG_RESULT($have_glibc)
7+
8+
AC_CHECK_HEADERS([fcntl.h])
9+
+AC_CHECK_HEADERS([linux/pci.h])
10+
+AC_CHECK_HEADERS([linux/spi/spidev.h])
11+
AC_CHECK_HEADERS([malloc.h])
12+
AC_CHECK_HEADERS([netdb.h])
13+
AC_CHECK_HEADERS([poll.h])
14+
@@ -694,10 +696,11 @@ PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [Linux libgpi
15+
PROCESS_ADAPTERS([SYSFSGPIO_ADAPTER], ["x$is_linux" = "xyes"], [Linux sysfs])
16+
PROCESS_ADAPTERS([REMOTE_BITBANG_ADAPTER], [true], [unused])
17+
PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libjaylink-0.2])
18+
-PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes"], [Linux build])
19+
+PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes" -a "x$ac_cv_header_linux_pci_h" = "xyes"], [Linux build])
20+
PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
21+
[internal error: validation should happen beforehand])
22+
-PROCESS_ADAPTERS([LINUXSPIDEV_ADAPTER], ["x$is_linux" = "xyes"], [Linux spidev])
23+
+PROCESS_ADAPTERS([LINUXSPIDEV_ADAPTER], ["x$is_linux" = "xyes" -a "x$ac_cv_header_linux_spi_spidev_h" = "xyes"],
24+
+ [Linux spidev])
25+
PROCESS_ADAPTERS([VDEBUG_ADAPTER], [true], [unused])
26+
PROCESS_ADAPTERS([JTAG_DPI_ADAPTER], [true], [unused])
27+
PROCESS_ADAPTERS([JTAG_VPI_ADAPTER], [true], [unused])
28+

0 commit comments

Comments
 (0)