gnumake: Fix build against glibc 2.27.
This commit is contained in:
parent
765194d7ab
commit
a551e6debc
@ -192,6 +192,8 @@ stdenv.mkDerivation ({
|
|||||||
maintainers = [ lib.maintainers.eelco ];
|
maintainers = [ lib.maintainers.eelco ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
} // meta;
|
} // meta;
|
||||||
|
|
||||||
|
passthru = { inherit version; };
|
||||||
}
|
}
|
||||||
|
|
||||||
// lib.optionalAttrs (cross != null) {
|
// lib.optionalAttrs (cross != null) {
|
||||||
|
@ -4,6 +4,8 @@ assert guileSupport -> ( pkgconfig != null && guile != null );
|
|||||||
|
|
||||||
let
|
let
|
||||||
version = "4.2.1";
|
version = "4.2.1";
|
||||||
|
|
||||||
|
needGlibcPatch = (stdenv.cc.libc.version or "") == "2.27";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "gnumake-${version}";
|
name = "gnumake-${version}";
|
||||||
@ -20,7 +22,7 @@ stdenv.mkDerivation {
|
|||||||
# included Makefiles, don't look in /usr/include and friends.
|
# included Makefiles, don't look in /usr/include and friends.
|
||||||
./impure-dirs.patch
|
./impure-dirs.patch
|
||||||
./pselect.patch
|
./pselect.patch
|
||||||
];
|
] ++ stdenv.lib.optional needGlibcPatch ./glibc-2.27.patch;
|
||||||
|
|
||||||
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
|
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
|
||||||
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
|
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Smith <psmith@gnu.org>
|
||||||
|
Date: Sun, 19 Nov 2017 15:09:16 -0500
|
||||||
|
Subject: * configure.ac: Support GLIBC glob interface version 2
|
||||||
|
|
||||||
|
---
|
||||||
|
configure.ac | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff -Naur a/configure b/configure
|
||||||
|
--- configure 2016-06-10 19:03:21.000000000 -0400
|
||||||
|
+++ configure 2018-02-18 04:40:32.971371555 -0500
|
||||||
|
@@ -11481,10 +11481,9 @@
|
||||||
|
#include <glob.h>
|
||||||
|
#include <fnmatch.h>
|
||||||
|
|
||||||
|
-#define GLOB_INTERFACE_VERSION 1
|
||||||
|
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
|
||||||
|
# include <gnu-versions.h>
|
||||||
|
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
|
||||||
|
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
|
||||||
|
gnu glob
|
||||||
|
# endif
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user