cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #145740 from alyssais/apr-cross

Browse source 
apr: fix cross
This commit is contained in:
Ryan Burns 2021-11-15 21:43:33 -08:00 committed by GitHub
commit e2c7d2b885
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/development/libraries/apr/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: { lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apr"; pname = "apr";
@ -17,6 +17,16 @@ stdenv.mkDerivation rec {
# convince fetchpatch to restore missing `a/`, `b/` to paths # convince fetchpatch to restore missing `a/`, `b/` to paths
extraPrefix = ""; 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 ]; ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
# This test needs the net # This test needs the net
@ -35,19 +45,19 @@ stdenv.mkDerivation rec {
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_file__dev_zero=yes" "ac_cv_file__dev_zero=yes"
"ac_cv_func_setpgrp_void=0" "ac_cv_func_setpgrp_void=0"
"apr_cv_process_shared_works=1"
"apr_cv_tcp_nodelay_with_cork=1" "apr_cv_tcp_nodelay_with_cork=1"
"CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
# Including the Windows headers breaks unistd.h. # Including the Windows headers breaks unistd.h.
# Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
"ac_cv_header_windows_h=no" "ac_cv_header_windows_h=no"
]; ];
CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; # - Update libtool for macOS 11 support
# - Regenerate for cross fix patch
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = doCheck = true;
# Update libtool for macOS 11 support
lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View file

@ -15543,7 +15543,9 @@ with pkgs;
appstream-glib = callPackage ../development/libraries/appstream-glib { }; appstream-glib = callPackage ../development/libraries/appstream-glib { };
apr = callPackage ../development/libraries/apr { }; apr = callPackage ../development/libraries/apr {
autoreconfHook = buildPackages.autoreconfHook269;
};
aprutil = callPackage ../development/libraries/apr-util { aprutil = callPackage ../development/libraries/apr-util {
db = if stdenv.isFreeBSD then db4 else db; db = if stdenv.isFreeBSD then db4 else db;