nixpkgs/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch

diff --git a/Makefile b/Makefile
index 3f1e18dc659d..163362b82f94 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -2,6 +2,8 @@
 
 .include <bsd.own.mk>
 
+INCSDIR= ${INCSDIR0}
+
 SUBDIR=	altq arch compat dev fs miscfs \
 	net net80211 netatalk netbt netcan netipsec netinet netinet6 \
         netmpls netsmb \
netbsd.compat: Fix cross compilation Not to netbsd, where it isn't needed, but elsewhere. A few things going on here: - Make compat use the "regular" not "host" makefile infra. This, however, makes more assumptions that the toolchain is BSD-like, and so we need to compensate for them with the likes of: - `LORDER=...` and `TSORT=...` - Move `export INSTALL_*` to install's setup hook so they don't interfere with coreutils install - Don't use `DESTDIR` for installing include files, instead set `INCSDIR`. This is more proper, but doesn't work when `INCSDIR` is set multiple times, unfortunately, as CLI defs override all other assignments. So instead set `INCSDIR0` on the CLI, and do some `INCSDIR = ${INCSDIR0}/...` in the relevant packages. - `INCSDIR` is set just in the NetBSD setup hook because FreeBSD uses `INCLUDEDIR`. 2021-09-01 23:44:25 +02:00			`diff --git a/Makefile b/Makefile`
			`index 3f1e18dc659d..163362b82f94 100644`
netbsd: Adapt to BSD-common infra changes for FreeBSD See https://github.com/NixOS/nixpkgs/pull/82131 for the rest of the changes for FreeBSD. This is PRed separately because it is a macOS moderate rebuild so we target staging. The main change is that we CD to the path we're building after applying patches, so we can patch other parts of the tree (from `extraPaths`) as needed. Another change is that `netbsd.install` no longer depends on `fts`, which it evidently no longer needs. 2022-10-06 06:51:05 +02:00			`--- a/sys/Makefile`
			`+++ b/sys/Makefile`
netbsd.compat: Fix cross compilation Not to netbsd, where it isn't needed, but elsewhere. A few things going on here: - Make compat use the "regular" not "host" makefile infra. This, however, makes more assumptions that the toolchain is BSD-like, and so we need to compensate for them with the likes of: - `LORDER=...` and `TSORT=...` - Move `export INSTALL_*` to install's setup hook so they don't interfere with coreutils install - Don't use `DESTDIR` for installing include files, instead set `INCSDIR`. This is more proper, but doesn't work when `INCSDIR` is set multiple times, unfortunately, as CLI defs override all other assignments. So instead set `INCSDIR0` on the CLI, and do some `INCSDIR = ${INCSDIR0}/...` in the relevant packages. - `INCSDIR` is set just in the NetBSD setup hook because FreeBSD uses `INCLUDEDIR`. 2021-09-01 23:44:25 +02:00			`@@ -2,6 +2,8 @@`

			`.include <bsd.own.mk>`

			`+INCSDIR= ${INCSDIR0}`
			`+`
			`SUBDIR= altq arch compat dev fs miscfs \`
			`net net80211 netatalk netbt netcan netipsec netinet netinet6 \`
			`netmpls netsmb \`