diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-06-28 07:19:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 07:19:00 +0100 |
| commit | 41902c2f7db9da1f5f0a324f6fa981bf94e38e5c (patch) | |
| tree | 93de4b1f3204c6ac9eb37ff404163d4e36ca9829 /pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch | |
| parent | 5bd99fbbd9830496860207c3d6d82eeec816b0c3 (diff) | |
| parent | ed3727682766a6c745718addda5a9d351daabea3 (diff) | |
| download | nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.tar nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.tar.gz nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.tar.bz2 nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.tar.lz nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.tar.xz nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.tar.zst nixpkgs-41902c2f7db9da1f5f0a324f6fa981bf94e38e5c.zip | |
Merge pull request #120501 from Mic92/gnumake
gnumake: use sh instead of /bin/sh by default
Diffstat (limited to 'pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch new file mode 100644 index 00000000000..e62aee7d999 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch @@ -0,0 +1,40 @@ +From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 24 Apr 2021 10:20:16 +0200 +Subject: [PATCH 2/2] remove impure dirs + +--- + src/read.c | 3 --- + src/remake.c | 2 -- + 2 files changed, 5 deletions(-) + +diff --git a/src/read.c b/src/read.c +index fa197fb..defacfb 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ static const char *default_include_directories[] = + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff --git a/src/remake.c b/src/remake.c +index fb237c5..94bff7d 100644 +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr) + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* +-- +2.31.1 + |