diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-06 16:17:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-06 16:17:13 +0200 |
| commit | 7c25c1fd888e9df9b69cbf0941a765ae88c3939a (patch) | |
| tree | 659aafd3a77b7e571c4de512a3d95370272ff4b9 /pkgs/development/tools/build-managers | |
| parent | eb5659f4c272444b3c3898afd6e77bab303763f6 (diff) | |
| parent | 25b20757e8c2e929ded0215eeaad19382497c318 (diff) | |
| download | nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.tar nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.tar.gz nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.tar.bz2 nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.tar.lz nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.tar.xz nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.tar.zst nixpkgs-7c25c1fd888e9df9b69cbf0941a765ae88c3939a.zip | |
Merge branch 'glibc-2.33' into staging
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 387650e85ab..69d9ba3d9ab 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { ./pselect.patch # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html ./glibc-2.27-glob.patch + ./glibc-2.33-glob.patch ]; nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch new file mode 100644 index 00000000000..d3e424d1c49 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch @@ -0,0 +1,17 @@ +diff --git glob/glob.c glob/glob.c +index 924f2b3..d4ef0c5 100644 +--- glob/glob.c ++++ glob/glob.c +@@ -212,8 +212,8 @@ my_realloc (p, n) + # define __alloca alloca + + +-#ifndef __GNU_LIBRARY__ + # define __stat stat ++#ifndef __GNU_LIBRARY__ + # ifdef STAT_MACROS_BROKEN + # undef S_ISDIR + # endif +-- +2.31.1 + |