Merge pull request #145740 from alyssais/apr-cross

apr: fix cross

Changed files
+19 -7
pkgs
development
libraries
top-level
+16 -6
pkgs/development/libraries/apr/default.nix
···
-
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "apr";
···
# convince fetchpatch to restore missing `a/`, `b/` to paths
extraPrefix = "";
})
] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
# This test needs the net
···
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_file__dev_zero=yes"
"ac_cv_func_setpgrp_void=0"
-
"apr_cv_process_shared_works=1"
"apr_cv_tcp_nodelay_with_cork=1"
] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
# Including the Windows headers breaks unistd.h.
# Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
"ac_cv_header_windows_h=no"
];
-
CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
-
nativeBuildInputs =
-
# Update libtool for macOS 11 support
-
lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ];
enableParallelBuilding = true;
···
+
{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "apr";
···
# convince fetchpatch to restore missing `a/`, `b/` to paths
extraPrefix = "";
})
+
+
# Fix cross.
+
(fetchpatch {
+
url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch";
+
sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y";
+
})
+
(fetchpatch {
+
url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
+
sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
+
})
] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
# This test needs the net
···
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_file__dev_zero=yes"
"ac_cv_func_setpgrp_void=0"
"apr_cv_tcp_nodelay_with_cork=1"
+
"CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
# Including the Windows headers breaks unistd.h.
# Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
"ac_cv_header_windows_h=no"
];
+
# - Update libtool for macOS 11 support
+
# - Regenerate for cross fix patch
+
nativeBuildInputs = [ autoreconfHook ];
+
doCheck = true;
enableParallelBuilding = true;
+3 -1
pkgs/top-level/all-packages.nix
···
appstream-glib = callPackage ../development/libraries/appstream-glib { };
-
apr = callPackage ../development/libraries/apr { };
aprutil = callPackage ../development/libraries/apr-util {
db = if stdenv.isFreeBSD then db4 else db;
···
appstream-glib = callPackage ../development/libraries/appstream-glib { };
+
apr = callPackage ../development/libraries/apr {
+
autoreconfHook = buildPackages.autoreconfHook269;
+
};
aprutil = callPackage ../development/libraries/apr-util {
db = if stdenv.isFreeBSD then db4 else db;