commit: aea11e0e4aea4ea84069cf3722c9bb41c5be9c3d
parent 55bf927462ee5a8e5984d14e61c221d7d3da1ca4
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 20 Feb 2020 20:10:31 -0800
Use our own linux-headers
Diffstat:
29 files changed, 103 insertions(+), 8 deletions(-)
diff --git a/pkg/alsa-lib/gen.lua b/pkg/alsa-lib/gen.lua
@@ -3,6 +3,7 @@ cflags{
'-I $dir',
'-I $dir/alsa',
'-I $srcdir/include',
+ '-I $builddir/pkg/linux-headers/include',
}
build('cat', '$outdir/config.h', {
@@ -36,7 +37,10 @@ pkg.hdrs = {
}),
copy('$outdir/include/alsa', '$dir/alsa', {'asoundlib.h', 'version.h'}),
}
-pkg.deps = {'$outdir/config.h'}
+pkg.deps = {
+ '$outdir/config.h',
+ 'pkg/linux-headers/headers',
+}
cc('src/pcm/pcm.c')
build('objcopy', '$outdir/src/pcm/pcm.nowarn.c.o', '$outdir/src/pcm/pcm.c.o', {
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
@@ -10,6 +10,7 @@ cflags{
'-I $srcdir/lib',
'-I $srcdir/src',
'-I $builddir/pkg/bearssl/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/zlib/include',
}
@@ -35,6 +36,7 @@ pkg.deps = {
'$outdir/curl_config.h',
'$gendir/headers',
'pkg/bearssl/headers',
+ 'pkg/linux-headers/headers',
'pkg/zlib/headers',
}
diff --git a/pkg/dosfstools/gen.lua b/pkg/dosfstools/gen.lua
@@ -3,6 +3,11 @@ cflags{
'-include $dir/config.h',
'-I $dir',
'-I $srcdir/src/blkdev',
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/linux-headers/headers',
}
exe('mkfs.fat', [[src/(mkfs.fat.c device_info.c blkdev/(blkdev.c linux_version.c))]])
diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua
@@ -6,6 +6,7 @@ cflags{
'-I $outdir/internal',
'-I $outdir/internal/support',
'-I $srcdir/lib',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/util-linux/include',
}
@@ -75,6 +76,7 @@ pkg.deps = {
'$outdir/internal/blkid/blkid_types.h',
'$outdir/internal/support/prof_err.h',
'$outdir/internal/crc32c_table.h',
+ 'pkg/linux-headers/headers',
'pkg/util-linux/headers',
}
diff --git a/pkg/efibootmgr/gen.lua b/pkg/efibootmgr/gen.lua
@@ -4,12 +4,18 @@ cflags{
'-I $srcdir/src/include',
'-I $builddir/pkg/efivar/include',
'-I $builddir/pkg/efivar/include/efivar',
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/efivar/headers',
+ 'pkg/linux-headers/headers',
}
exe('efibootmgr', [[
src/(efibootmgr.c efi.c unparse_path.c)
$builddir/pkg/efivar/(libefiboot.a libefivar.a)
-]], {'pkg/efivar/headers'})
+]])
file('bin/efibootmgr', '755', '$outdir/efibootmgr')
man{'src/efibootmgr.8'}
diff --git a/pkg/efivar/gen.lua b/pkg/efivar/gen.lua
@@ -8,6 +8,7 @@ cflags{
'-include $dir/compat.h',
'-I $outdir/include',
'-I $srcdir/src/include',
+ '-I $builddir/pkg/linux-headers/include',
}
sub('tools.ninja', function()
@@ -40,7 +41,10 @@ pkg.hdrs = {
}),
'$outdir/include/efivar/efivar-guids.h',
}
-pkg.deps = {'$outdir/include/efivar/efivar-guids.h'}
+pkg.deps = {
+ '$outdir/include/efivar/efivar-guids.h',
+ 'pkg/linux-headers/headers',
+}
lib('libefiboot.a', [[
src/(
diff --git a/pkg/hostap/gen.lua b/pkg/hostap/gen.lua
@@ -4,11 +4,13 @@ cflags{
'-I $srcdir/src',
'-I $builddir/pkg/bearssl/include',
'-I $builddir/pkg/libnl/include',
+ '-I $builddir/pkg/linux-headers/include',
}
pkg.deps = {
'pkg/bearssl/headers',
'pkg/libnl/headers',
+ 'pkg/linux-headers/headers',
}
lib('libcommon.a', 'src/utils/(common.c eloop.c os_unix.c wpabuf.c wpa_debug.c)')
diff --git a/pkg/iproute2/gen.lua b/pkg/iproute2/gen.lua
@@ -6,6 +6,11 @@ cflags{
'-I $srcdir/include',
'-I $srcdir/include/uapi',
'-I $srcdir/misc',
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/linux-headers/headers',
}
lib('libnetlink.a', [[lib/(
diff --git a/pkg/kbd/gen.lua b/pkg/kbd/gen.lua
@@ -7,6 +7,11 @@ cflags{
'-I $srcdir/src/libkbdfile',
'-I $srcdir/src/libkeymap',
'-I $srcdir/src/libkeymap/keymap',
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/linux-headers/headers',
}
lib('libcommon.a', 'src/libcommon/(getfd.c error.c version.c xmalloc.c)')
diff --git a/pkg/libdrm/gen.lua b/pkg/libdrm/gen.lua
@@ -11,6 +11,7 @@ cflags{
'-I $dir',
'-I $srcdir',
'-I $srcdir/include/drm',
+ '-I $builddir/pkg/linux-headers/include',
}
pkg.hdrs = {
@@ -26,6 +27,10 @@ pkg.hdrs = {
}),
}
+pkg.deps = {
+ 'pkg/linux-headers/headers',
+}
+
lib('libdrm.a', {
'xf86drm.c',
'xf86drmHash.c',
diff --git a/pkg/libevdev/gen.lua b/pkg/libevdev/gen.lua
@@ -2,11 +2,16 @@ cflags{
'-I $dir',
'-I $outdir',
'-I $srcdir/include',
+ '-I $builddir/pkg/linux-headers/include',
}
pkg.hdrs = copy('$outdir/include/libevdev', '$srcdir/libevdev', {'libevdev.h'})
pkg.hdrs.install = true
+pkg.deps = {
+ 'pkg/linux-headers/headers',
+}
+
build('awk', '$outdir/event-names.h', {
'$srcdir/include/linux/input.h',
'$srcdir/include/linux/input-event-codes.h',
diff --git a/pkg/libfido2/gen.lua b/pkg/libfido2/gen.lua
@@ -5,6 +5,7 @@ cflags{
'-D _FIDO_INTERNAL',
'-I $builddir/pkg/libcbor/include',
'-I $builddir/pkg/libressl/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $srcdir/src',
'-I $basedir/pkg/openbsd/include',
}
@@ -19,6 +20,7 @@ pkg.deps = {
'$outdir/config.h',
'pkg/libcbor/headers',
'pkg/libressl/headers',
+ 'pkg/linux-headers/headers',
}
build('cat', '$outdir/config.h', {
diff --git a/pkg/libinput/gen.lua b/pkg/libinput/gen.lua
@@ -3,11 +3,13 @@ cflags{
'-I $dir',
'-I $srcdir/include',
'-I $basedir/pkg/libevdev/src',
+ '-I $builddir/pkg/linux-headers/include',
'-I $basedir/pkg/mtdev/src/include',
}
pkg.deps = {
'pkg/libevdev/fetch',
+ 'pkg/linux-headers/fetch',
'pkg/mtdev/fetch',
}
diff --git a/pkg/libnl/gen.lua b/pkg/libnl/gen.lua
@@ -5,6 +5,7 @@ cflags{
'-I $outdir/include',
'-I $srcdir/include',
'-I $srcdir/include/linux-private',
+ '-I $builddir/pkg/linux-headers/include',
}
build('sed', '$outdir/include/netlink/version.h', '$srcdir/include/netlink/version.h.in', {
@@ -49,11 +50,16 @@ pkg.hdrs = {
'$outdir/include/netlink/version.h',
}
+pkg.deps = {
+ '$gendir/headers',
+ 'pkg/linux-headers/headers',
+}
+
lib('libnl-3.a', [[lib/(
addr.c attr.c cache.c cache_mngr.c cache_mngt.c data.c
error.c handlers.c msg.c nl.c object.c socket.c utils.c
version.c hash.c hashtable.c mpls.c
-)]], {'$gendir/headers'})
+)]])
lib('libnl-genl-3.a', 'lib/genl/(ctrl.c family.c genl.c mngt.c)', {'$gendir/headers'})
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
@@ -16,6 +16,7 @@ cflags{
'-I $srcdir',
'-I $basedir/pkg/ffmpeg/src',
'-I $builddir/pkg/ffmpeg/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/zlib/include',
}
local libs = {
@@ -31,6 +32,7 @@ local libs = {
pkg.deps = {
'$outdir/version.h',
'pkg/ffmpeg/headers',
+ 'pkg/linux-headers/headers',
'pkg/zlib/headers',
}
diff --git a/pkg/mtdev/gen.lua b/pkg/mtdev/gen.lua
@@ -1,4 +1,11 @@
-cflags{'-I $srcdir/include'}
+cflags{
+ '-I $srcdir/include',
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/linux-headers/headers',
+}
lib('libmtdev.a', {
'src/caps.c',
diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
@@ -30,6 +30,7 @@ cflags{
'-I $builddir/pkg/curl/include',
'-I $builddir/pkg/libjpeg-turbo/include',
'-I $builddir/pkg/libpng/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland/include',
'-I $builddir/pkg/wayland-protocols/include',
@@ -65,6 +66,7 @@ pkg.deps = {
'pkg/libjpeg-turbo/headers',
'pkg/libpng/headers',
'pkg/libxkbcommon/fetch',
+ 'pkg/linux-headers/headers',
'pkg/pixman/headers',
'pkg/utf8proc/fetch',
'pkg/wayland/headers',
diff --git a/pkg/nginx/gen.lua b/pkg/nginx/gen.lua
@@ -3,9 +3,10 @@ cflags{
'-I $srcdir/src/core',
'-I $srcdir/src/event',
'-I $srcdir/src/os/unix',
+ '-I $builddir/pkg/linux-headers/include',
}
local libs = {}
-pkg.deps = {}
+pkg.deps = {'pkg/linux-headers/headers'}
local modules = {}
for line in iterlines('modules.txt') do
diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua
@@ -12,6 +12,7 @@ cflags{
'-I $basedir/pkg/openbsd/include',
'-I $builddir/pkg/libfido2/include',
'-I $builddir/pkg/libressl/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/zlib/include',
'-idirafter $srcdir/openbsd-compat',
}
@@ -19,6 +20,7 @@ cflags{
pkg.deps = {
'pkg/libfido2/headers',
'pkg/libressl/headers',
+ 'pkg/linux-headers/headers',
'pkg/zlib/headers',
}
diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua
@@ -3,9 +3,10 @@ cflags{
'-I $dir',
'-I $srcdir/Include',
'-I $srcdir/Include/internal',
+ '-I $builddir/pkg/linux-headers/include',
}
-pkg.deps = {}
+pkg.deps = {'pkg/linux-headers/headers'}
local libs = {}
local modules = load 'modules.lua'
diff --git a/pkg/st/gen.lua b/pkg/st/gen.lua
@@ -3,6 +3,7 @@ cflags{
'-I $dir',
'-I $basedir/pkg/fontconfig/src',
'-I $basedir/pkg/libxkbcommon/src',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland/include',
'-I $builddir/pkg/wayland-protocols/include',
@@ -12,6 +13,7 @@ cflags{
pkg.deps = {
'pkg/fontconfig/fetch',
'pkg/libxkbcommon/fetch',
+ 'pkg/linux-headers/headers',
'pkg/pixman/headers',
'pkg/wayland/headers',
'pkg/wayland-protocols/headers',
diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua
@@ -5,6 +5,11 @@ cflags{
'-I $srcdir/linux',
'-I $srcdir',
'-I $outdir',
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/linux-headers/headers',
}
build('cat', '$outdir/config.h', {
diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua
@@ -10,6 +10,7 @@ cflags{
'-I $basedir/pkg/libinput/src/src',
'-I $basedir/pkg/libxkbcommon/src',
'-I $builddir/pkg/libdrm/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland-protocols/include',
'-I $builddir/pkg/wayland/include',
@@ -55,6 +56,7 @@ pkg.deps = {
'pkg/libdrm/headers',
'pkg/libinput/fetch',
'pkg/libxkbcommon/fetch',
+ 'pkg/linux-headers/headers',
'pkg/pixman/headers',
'pkg/wayland/headers',
'pkg/wayland-protocols/headers',
diff --git a/pkg/syslinux/gen.lua b/pkg/syslinux/gen.lua
@@ -7,6 +7,12 @@ cflags{
-- BSD pax/tar transforms symlink targets as well as filenames,
-- trashing the libinstaller/advconst.h symlink.
'-I $srcdir/com32/include/syslinux',
+
+ '-I $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/linux-headers/headers',
}
build('awk', '$outdir/version.h', {'$srcdir/version', '|', '$dir/version.awk'}, {
diff --git a/pkg/tinyemu/gen.lua b/pkg/tinyemu/gen.lua
@@ -7,11 +7,13 @@ cflags{
[[-D 'CONFIG_VERSION="2019-02-10"']],
'-I $builddir/pkg/bearssl/include',
'-I $builddir/pkg/curl/include',
+ '-I $builddir/pkg/linux-headers/include',
}
pkg.deps = {
'pkg/bearssl/headers',
'pkg/curl/headers',
+ 'pkg/linux-headers/headers',
}
build('cc', '$outdir/riscv_cpu32.o', '$srcdir/riscv_cpu.c', {cflags='$cflags -DMAX_XLEN=32'})
diff --git a/pkg/util-linux/gen.lua b/pkg/util-linux/gen.lua
@@ -4,6 +4,7 @@ cflags{
'-I $outdir',
'-I $srcdir/include',
'-I $srcdir/libuuid/src',
+ '-I $builddir/pkg/linux-headers/include',
}
build('cat', '$outdir/config.h', {
@@ -28,6 +29,7 @@ pkg.deps = {
'$outdir/config.h',
'$outdir/libsmartcols.h',
'$outdir/libfdisk.h',
+ 'pkg/linux-headers/headers',
}
lib('libcommon.a', [[
diff --git a/pkg/velox/gen.lua b/pkg/velox/gen.lua
@@ -4,6 +4,7 @@ cflags{
'-I $basedir/pkg/fontconfig/src',
'-I $basedir/pkg/libinput/src/src',
'-I $basedir/pkg/libxkbcommon/src',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/swc/include',
'-I $builddir/pkg/wayland/include',
@@ -24,6 +25,7 @@ pkg.deps = {
'pkg/fontconfig/fetch',
'pkg/libinput/fetch',
'pkg/libxkbcommon/fetch',
+ 'pkg/linux-headers/headers',
'pkg/pixman/headers',
'pkg/swc/fetch',
'pkg/swc/headers',
diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua
@@ -5,6 +5,7 @@ cflags{
'-I $basedir/pkg/fontconfig/src',
'-I $basedir/pkg/freetype/src/include',
'-I $builddir/pkg/libdrm/include',
+ '-I $builddir/pkg/linux-headers/include',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland/include',
}
@@ -58,6 +59,7 @@ pkg.deps = {
'pkg/fontconfig/fetch',
'pkg/freetype/fetch',
'pkg/libdrm/headers',
+ 'pkg/linux-headers/headers',
'pkg/pixman/headers',
'pkg/wayland/headers',
}
diff --git a/src/gen.lua b/src/gen.lua
@@ -4,9 +4,11 @@ cflags{
'-std=c11',
}
+cc('devd.c', 'pkg/linux-headers/headers', {cflags='$cflags -I $builddir/pkg/linux-headers/include'})
+
file('libexec/applyperms', '755', exe('applyperms', {'applyperms.c'}))
file('libexec/devd-trigger', '755', exe('devd-trigger', {'devd-trigger.c'}))
file('libexec/mergeperms', '755', exe('mergeperms', {'mergeperms.c'}))
file('libexec/shutdown', '755', exe('shutdown', {'shutdown.c'}))
-file('bin/devd', '755', exe('devd', {'devd.c'}))
+file('bin/devd', '755', exe('devd', {'devd.c.o'}))
file('bin/syslogd', '755', exe('syslogd', {'syslogd.c'}))
