Merge pull request #106761 from Atemu/fix/cifs-utils-cross

cifs-utils: don't check for AC_FUNC_MALLOC when cross compiling
This commit is contained in:
Matthew Bauer 2020-12-14 16:56:03 -06:00 committed by GitHub
commit 079535f0df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, docutils, pkgconfig { stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig
, kerberos, keyutils, pam, talloc }: , kerberos, keyutils, pam, talloc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
buildInputs = [ kerberos keyutils pam talloc ]; buildInputs = [ kerberos keyutils pam talloc ];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
makeFlags = [ "root_sbindir=$(out)/sbin" ]; makeFlags = [ "root_sbindir=$(out)/sbin" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {