mirror of https://github.com/oxen-io/oxen-core.git
Add patch for hidapi + autoconf 2.70+
Fixes the mac build, and will fix future linux build once distros start shipping 2.70+.
This commit is contained in:
parent
4f6f67d151
commit
14cb314f70
|
@ -519,6 +519,7 @@ else()
|
||||||
endif()
|
endif()
|
||||||
build_external(hidapi
|
build_external(hidapi
|
||||||
DEPENDS ${maybe_eudev} libusb_external
|
DEPENDS ${maybe_eudev} libusb_external
|
||||||
|
PATCH_COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/utils/build_scripts/hidapi-autoconf-duplicate-macro-dir.patch
|
||||||
CONFIGURE_COMMAND autoreconf -ivf && ./configure ${cross_host} --prefix=${DEPS_DESTDIR} --disable-shared --enable-static --with-pic
|
CONFIGURE_COMMAND autoreconf -ivf && ./configure ${cross_host} --prefix=${DEPS_DESTDIR} --disable-shared --enable-static --with-pic
|
||||||
"CC=${deps_cc}" "CXX=${deps_cxx}" "CFLAGS=${deps_CFLAGS}" "CXXFLAGS=${deps_CXXFLAGS}"
|
"CC=${deps_cc}" "CXX=${deps_cxx}" "CFLAGS=${deps_CFLAGS}" "CXXFLAGS=${deps_CXXFLAGS}"
|
||||||
${cross_extra}
|
${cross_extra}
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
From 363461494702dfd8f37943f670dd7315c4f4e364 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Palus <atler@pld-linux.org>
|
||||||
|
Date: Fri, 25 Dec 2020 13:51:30 +0100
|
||||||
|
Subject: [PATCH] configure.ac: remove duplicate AC_CONFIG_MACRO_DIR
|
||||||
|
|
||||||
|
fixes build with autoconf 2.70
|
||||||
|
---
|
||||||
|
configure.ac | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 220909a0..77da67af 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
|
||||||
|
|
||||||
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
|
||||||
|
-AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
|
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||||
|
LT_INIT
|
Loading…
Reference in New Issue