bridge-utils: fix cross-compilation

This commit is contained in:
Nick Spinale 2019-01-09 16:45:29 +00:00 committed by Bjørn Forsman
parent 80e2c41b87
commit 5856dc86ac
2 changed files with 29 additions and 3 deletions

View File

@ -0,0 +1,25 @@
diff --git a/configure.in b/configure.in
index 5e3f89b..19be6d9 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,7 @@ dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_RANLIB
+AC_CHECK_TOOL([AR], [ar])
dnl Checks for header files.
AC_HEADER_STDC
diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
index 20512c4..83c802b 100644
--- a/libbridge/Makefile.in
+++ b/libbridge/Makefile.in
@@ -1,7 +1,7 @@
KERNEL_HEADERS=-I@KERNEL_HEADERS@
-AR=ar
+AR=@AR@
RANLIB=@RANLIB@
CC=@CC@

View File

@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
};
# Remove patch once the kernel headers are updated
patches = [ ./add-ip6-header.patch ];
patches = [
./autoconf-ar.patch
./add-ip6-header.patch # Remove patch once the kernel headers are updated
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
postInstall = ''
# The bridge utils build does not fail even if the brctl binary