commit: d4297a13c823b62d29d9850ab5815f6c78baf35a parent ab438ea71e5b61956b9ad8c5b5f56e3a6c6b66c3 Author: Michael Forney <mforney@mforney.org> Date: Thu, 4 Jun 2020 20:48:01 -0700 Use -isystem to include library headers This way, warnings from headers that come from another package (in particular linux-headers) won't show up when they get included. To make sure we still track dependencies, use -MD instead of -MMD.Diffstat:
67 files changed, 175 insertions(+), 175 deletions(-)diff --git a/pkg/acme-client/gen.lua b/pkg/acme-client/gen.lua@@ -1,10 +1,10 @@ set('srcdir', '$basedir/pkg/openbsd/src/usr.sbin/acme-client') cflags{ '-D _GNU_SOURCE', -- for memmem - '-I $basedir/pkg/openbsd/include', - '-I $builddir/pkg/libressl/include', - '-I $builddir/pkg/libtls-bearssl/include', '-I $srcdir', + '-isystem $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/libressl/include', + '-isystem $builddir/pkg/libtls-bearssl/include', '-idirafter $basedir/pkg/openbsd/src/sys', }diff --git a/pkg/alsa-lib/gen.lua b/pkg/alsa-lib/gen.lua@@ -3,7 +3,7 @@ cflags{ '-I $dir', '-I $dir/alsa', '-I $srcdir/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } build('cat', '$outdir/config.h', {diff --git a/pkg/alsa-utils/gen.lua b/pkg/alsa-utils/gen.lua@@ -2,7 +2,7 @@ cflags{ '-D _GNU_SOURCE=', '-I $dir', '-I $srcdir/include', - '-I $builddir/pkg/alsa-lib/include', + '-isystem $builddir/pkg/alsa-lib/include', } pkg.deps = {'pkg/alsa-lib/headers'}diff --git a/pkg/binutils/gen.lua b/pkg/binutils/gen.lua@@ -12,7 +12,7 @@ cflags{ '-I $srcdir/include', '-I $outdir/bfd', '-I $srcdir/bfd', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/zlib/include', } pkg.deps = {diff --git a/pkg/catgirl/gen.lua b/pkg/catgirl/gen.lua@@ -1,8 +1,8 @@ cflags{ '-std=c11', '-Wall', '-Wextra', '-Wpedantic', '-D _GNU_SOURCE', - '-I $builddir/pkg/libtls-bearssl/include', - '-I $builddir/pkg/ncurses/include', + '-isystem $builddir/pkg/libtls-bearssl/include', + '-isystem $builddir/pkg/ncurses/include', } pkg.deps = {diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua@@ -9,9 +9,9 @@ cflags{ '-I $outdir/include', '-I $srcdir/lib', '-I $srcdir/src', - '-I $builddir/pkg/bearssl/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/zlib/include', } build('cat', '$outdir/curl_config.h', {diff --git a/pkg/dmenu/gen.lua b/pkg/dmenu/gen.lua@@ -1,12 +1,12 @@ cflags{ [[-D 'VERSION="4.6"']], '-I $dir', - '-I $builddir/pkg/fontconfig/include', - '-I $builddir/pkg/libxkbcommon/include', - '-I $builddir/pkg/pixman/include', - '-I $builddir/pkg/swc/include', - '-I $builddir/pkg/wayland/include', - '-I $builddir/pkg/wld/include', + '-isystem $builddir/pkg/fontconfig/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/swc/include', + '-isystem $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/wld/include', } pkg.deps = {diff --git a/pkg/dnssec-rr/gen.lua b/pkg/dnssec-rr/gen.lua@@ -1,7 +1,7 @@ cflags{ '-std=c11', '-Wall', '-Wpedantic', '-D _POSIX_C_SOURCE=200809L', - '-I $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/bearssl/include', } pkg.deps = {diff --git a/pkg/dosfstools/gen.lua b/pkg/dosfstools/gen.lua@@ -3,7 +3,7 @@ cflags{ '-include $dir/config.h', '-I $dir', '-I $srcdir/src/blkdev', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua@@ -6,8 +6,8 @@ cflags{ '-I $outdir/internal', '-I $outdir/internal/support', '-I $srcdir/lib', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/util-linux/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/util-linux/include', } build('cat', '$outdir/config.h', {diff --git a/pkg/efibootmgr/gen.lua b/pkg/efibootmgr/gen.lua@@ -2,9 +2,9 @@ cflags{ [[-D 'EFIBOOTMGR_VERSION="17"']], [[-D 'DEFAULT_LOADER="/linux"']], '-I $srcdir/src/include', - '-I $builddir/pkg/efivar/include', - '-I $builddir/pkg/efivar/include/efivar', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/efivar/include', + '-isystem $builddir/pkg/efivar/include/efivar', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/efivar/gen.lua b/pkg/efivar/gen.lua@@ -8,7 +8,7 @@ cflags{ '-include $dir/compat.h', '-I $outdir/include', '-I $srcdir/src/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } sub('tools.ninja', function()diff --git a/pkg/f2fs-tools/gen.lua b/pkg/f2fs-tools/gen.lua@@ -3,8 +3,8 @@ cflags{ '-D HAVE_CONFIG_H', '-I $dir', '-I $srcdir/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/util-linux/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/util-linux/include', } pkg.deps = {diff --git a/pkg/farbfeld/gen.lua b/pkg/farbfeld/gen.lua@@ -1,8 +1,8 @@ cflags{ '-std=c99', '-Wpedantic', '-Wall', '-Wextra', '-D _DEFAULT_SOURCE', - '-I $builddir/pkg/libjpeg-turbo/include', - '-I $builddir/pkg/libpng/include', + '-isystem $builddir/pkg/libjpeg-turbo/include', + '-isystem $builddir/pkg/libpng/include', } cc('util.c')diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua@@ -7,9 +7,9 @@ cflags{ '-I $outdir/include', '-I $outdir/internal', '-I $srcdir', - '-I $builddir/pkg/alsa-lib/include', - '-I $builddir/pkg/libtls-bearssl/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/alsa-lib/include', + '-isystem $builddir/pkg/libtls-bearssl/include', + '-isystem $builddir/pkg/zlib/include', } nasmflags{ '-i $srcdir/',diff --git a/pkg/file/gen.lua b/pkg/file/gen.lua@@ -6,7 +6,7 @@ cflags{ '-D _GNU_SOURCE', '-I $dir', '-I $outdir/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/zlib/include', } build('sed', '$outdir/include/magic.h', '$srcdir/src/magic.h.in', {diff --git a/pkg/fontconfig/gen.lua b/pkg/fontconfig/gen.lua@@ -3,9 +3,9 @@ cflags{ '-I $dir', '-I $outdir', '-I $srcdir', - '-I $builddir/pkg/freetype/include', - '-I $builddir/pkg/expat/include', - '-I $builddir/pkg/util-linux/include', + '-isystem $builddir/pkg/freetype/include', + '-isystem $builddir/pkg/expat/include', + '-isystem $builddir/pkg/util-linux/include', } pkg.hdrs = copy('$outdir/include/fontconfig', '$srcdir/fontconfig', {diff --git a/pkg/freetype/gen.lua b/pkg/freetype/gen.lua@@ -8,7 +8,7 @@ cflags{ '-I $srcdir/builds/unix', '-I $srcdir/include/freetype/config', '-I $srcdir/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/zlib/include', } pkg.hdrs = copy('$outdir/include', '$srcdir/include', paths[[diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua@@ -3,8 +3,8 @@ cflags{ '-I $srcdir', '-I $srcdir/compat/regex', '-I $outdir', - '-I $builddir/pkg/curl/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/curl/include', + '-isystem $builddir/pkg/zlib/include', } pkg.deps = {diff --git a/pkg/hostap/gen.lua b/pkg/hostap/gen.lua@@ -2,9 +2,9 @@ cflags{ '-include $dir/config.h', '-I $srcdir/src/utils', '-I $srcdir/src', - '-I $builddir/pkg/bearssl/include', - '-I $builddir/pkg/libnl/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/libnl/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/iproute2/gen.lua b/pkg/iproute2/gen.lua@@ -7,7 +7,7 @@ cflags{ '-I $srcdir/include', '-I $srcdir/include/uapi', '-I $srcdir/misc', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/kbd/gen.lua b/pkg/kbd/gen.lua@@ -7,7 +7,7 @@ cflags{ '-I $srcdir/src/libkbdfile', '-I $srcdir/src/libkeymap', '-I $srcdir/src/libkeymap/keymap', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/less/gen.lua b/pkg/less/gen.lua@@ -1,6 +1,6 @@ cflags{ '-I $dir', - '-I $builddir/pkg/ncurses/include', + '-isystem $builddir/pkg/ncurses/include', } cc('version.c')diff --git a/pkg/libass/gen.lua b/pkg/libass/gen.lua@@ -1,7 +1,7 @@ cflags{ '-I $dir', - '-I $builddir/pkg/freetype/include', - '-I $builddir/pkg/fribidi/include', + '-isystem $builddir/pkg/freetype/include', + '-isystem $builddir/pkg/fribidi/include', } nasmflags{ '-D ARCH_X86_64=1',diff --git a/pkg/libdrm/gen.lua b/pkg/libdrm/gen.lua@@ -11,7 +11,7 @@ cflags{ '-I $dir', '-I $srcdir', '-I $srcdir/include/drm', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.hdrs = { @@ -40,7 +40,7 @@ lib('libdrm.a', { }) if config.video_drivers and config.video_drivers['intel'] then - cflags{'-I $builddir/pkg/libpciaccess/include'} + cflags{'-isystem $builddir/pkg/libpciaccess/include'} table.insert(pkg.deps, 'pkg/libpciaccess/headers') lib('libdrm_intel.a', [[ intel/(diff --git a/pkg/libevdev/gen.lua b/pkg/libevdev/gen.lua@@ -2,7 +2,7 @@ cflags{ '-I $dir', '-I $outdir', '-I $srcdir/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.hdrs = copy('$outdir/include/libevdev', '$srcdir/libevdev', {'libevdev.h'})diff --git a/pkg/libfido2/gen.lua b/pkg/libfido2/gen.lua@@ -3,11 +3,11 @@ cflags{ '-include $outdir/config.h', '-D _DEFAULT_SOURCE', '-D _FIDO_INTERNAL', - '-I $builddir/pkg/bearssl/include', - '-I $builddir/pkg/libcbor/include', - '-I $builddir/pkg/linux-headers/include', '-I $srcdir/src', - '-I $basedir/pkg/openbsd/include', + '-isystem $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/libcbor/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.hdrs = copy('$outdir/include', '$srcdir/src', {diff --git a/pkg/libgpiod/gen.lua b/pkg/libgpiod/gen.lua@@ -1,7 +1,7 @@ cflags{ '-std=c99', '-Wall', '-Wextra', '-Wpedantic', '-I $srcdir/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', '-include $dir/config.h', }diff --git a/pkg/libinput/gen.lua b/pkg/libinput/gen.lua@@ -2,9 +2,9 @@ cflags{ '-std=c11', '-Wall', '-I $dir', '-I $srcdir/include', - '-I $builddir/pkg/libevdev/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/mtdev/include', + '-isystem $builddir/pkg/libevdev/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/mtdev/include', } pkg.hdrs = copy('$outdir/include', '$srcdir/src', {'libinput.h'})diff --git a/pkg/libliftoff/gen.lua b/pkg/libliftoff/gen.lua@@ -1,7 +1,7 @@ cflags{ '-std=c99', '-Wall', '-Wpedantic', - '-I $builddir/pkg/libdrm/include', '-I $srcdir/include', + '-isystem $builddir/pkg/libdrm/include', } pkg.deps = {diff --git a/pkg/libnl/gen.lua b/pkg/libnl/gen.lua@@ -5,7 +5,7 @@ cflags{ '-I $outdir/include', '-I $srcdir/include', '-I $srcdir/include/linux-private', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } build('sed', '$outdir/include/netlink/version.h', '$srcdir/include/netlink/version.h.in', {diff --git a/pkg/libpng/gen.lua b/pkg/libpng/gen.lua@@ -2,7 +2,7 @@ cflags{ '-D HAVE_CONFIG_H', '-I $dir', '-I $outdir/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/zlib/include', } build('awk', '$outdir/pnglibconf.tf4', {diff --git a/pkg/libtermkey/gen.lua b/pkg/libtermkey/gen.lua@@ -1,6 +1,6 @@ cflags{ '-std=c99', '-Wall', - '-I $builddir/pkg/ncurses/include', + '-isystem $builddir/pkg/ncurses/include', } pkg.hdrs = copy('$outdir/include', '$srcdir', {'termkey.h'})diff --git a/pkg/libtls-bearssl/gen.lua b/pkg/libtls-bearssl/gen.lua@@ -1,8 +1,8 @@ cflags{ '-std=c11', '-Wall', '-Wpedantic', '-D _DEFAULT_SOURCE', - '-I $builddir/pkg/bearssl/include', '-I $srcdir', + '-isystem $builddir/pkg/bearssl/include', } pkg.hdrs = copy('$outdir/include', '$srcdir', {'tls.h'})diff --git a/pkg/lpeg/gen.lua b/pkg/lpeg/gen.lua@@ -1,7 +1,7 @@ cflags{ '-std=c99', '-D NDEBUG', - '-I $builddir/pkg/lua/include', + '-isystem $builddir/pkg/lua/include', } pkg.deps = {'pkg/lua/headers'}diff --git a/pkg/mandoc/gen.lua b/pkg/mandoc/gen.lua@@ -1,7 +1,7 @@ cflags{ '-I $dir', - '-I $basedir/pkg/openbsd/include', - '-I $builddir/pkg/zlib/include', + '-isystem $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/zlib/include', } lib('libmandoc.a', {diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua@@ -14,10 +14,10 @@ cflags{ '-I $dir', '-I $outdir', '-I $srcdir', - '-I $basedir/pkg/ffmpeg/src', - '-I $builddir/pkg/ffmpeg/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/zlib/include', + '-isystem $basedir/pkg/ffmpeg/src', + '-isystem $builddir/pkg/ffmpeg/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/zlib/include', } local libs = { 'ffmpeg/libavcodec.a.d', @@ -124,29 +124,29 @@ end sources = table.keys(sources) if options['HAVE_ALSA'] then - cflags{'-I $builddir/pkg/alsa-lib/include'} + cflags{'-isystem $builddir/pkg/alsa-lib/include'} table.insert(libs, 'alsa-lib/libasound.a') table.insert(pkg.deps, 'pkg/alsa-lib/headers') end if options['HAVE_DRM'] then - cflags{'-I $builddir/pkg/libdrm/include'} + cflags{'-isystem $builddir/pkg/libdrm/include'} table.insert(libs, 'libdrm/libdrm.a') table.insert(pkg.deps, 'pkg/libdrm/headers') end if options['HAVE_LIBASS'] then - cflags{'-I $builddir/pkg/libass/include'} + cflags{'-isystem $builddir/pkg/libass/include'} table.insert(libs, 'libass/libass.a.d') table.insert(pkg.deps, 'pkg/libass/headers') end if options['HAVE_LUA'] then - cflags{'-I $builddir/pkg/lua/include'} + cflags{'-isystem $builddir/pkg/lua/include'} table.insert(libs, 'lua/liblua.a') table.insert(pkg.deps, 'pkg/lua/headers') end if options['HAVE_WAYLAND'] then cflags{ - '-I $builddir/pkg/libxkbcommon/include', - '-I $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/wayland/include', } table.insert(libs, { 'wayland/libwayland-client.a.d',diff --git a/pkg/msmtp/gen.lua b/pkg/msmtp/gen.lua@@ -2,7 +2,7 @@ cflags{ '-D HAVE_CONFIG_H', string.format([[-D 'SYSCONFDIR="%s/etc"']], config.prefix), '-I $dir', - '-I $builddir/pkg/libressl/include', + '-isystem $builddir/pkg/libressl/include', } exe('msmtp', [[diff --git a/pkg/mtdev/gen.lua b/pkg/mtdev/gen.lua@@ -1,6 +1,6 @@ cflags{ '-I $srcdir/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.hdrs = copy('$outdir/include', '$srcdir/include', {diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua@@ -17,10 +17,10 @@ cflags{ '-D SHARE_JPEG', '-I $srcdir/include', '-I $outdir', - '-I $builddir/pkg/freetype/include', - '-I $builddir/pkg/jbig2dec/include', - '-I $builddir/pkg/libjpeg-turbo/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/freetype/include', + '-isystem $builddir/pkg/jbig2dec/include', + '-isystem $builddir/pkg/libjpeg-turbo/include', + '-isystem $builddir/pkg/zlib/include', } sub('tools.ninja', function() @@ -78,10 +78,10 @@ cc('platform/x11/wl_main.c', { 'pkg/wayland-protocols/headers', }, {cflags={ '$cflags', - '-I $builddir/pkg/libxkbcommon/include', - '-I $builddir/pkg/pixman/include', - '-I $builddir/pkg/wayland/include', - '-I $builddir/pkg/wayland-protocols/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/wayland-protocols/include', }}) exe('bin/mupdf', [[ platform/x11/(pdfapp.c wl_main.c.o)diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua@@ -27,17 +27,6 @@ cflags{ '-I $srcdir/content/handlers', '-I $outdir', '-I $outdir/libdom/include', - '-I $builddir/pkg/curl/include', - '-I $builddir/pkg/freetype/include', - '-I $builddir/pkg/libjpeg-turbo/include', - '-I $builddir/pkg/libpng/include', - '-I $builddir/pkg/libxkbcommon/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/pixman/include', - '-I $builddir/pkg/wayland/include', - '-I $builddir/pkg/utf8proc/include', - '-I $builddir/pkg/wayland-protocols/include', - '-I $builddir/pkg/zlib/include', '-I $dir/libcss/src/include', '-I $dir/libdom/src/include', '-I $dir/libhubbub/src/include', @@ -47,7 +36,18 @@ cflags{ '-I $dir/libparserutils/src/include', '-I $dir/libsvgtiny/src/include', '-I $dir/libwapcaplet/src/include', - '-I $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/curl/include', + '-isystem $builddir/pkg/freetype/include', + '-isystem $builddir/pkg/libjpeg-turbo/include', + '-isystem $builddir/pkg/libpng/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/utf8proc/include', + '-isystem $builddir/pkg/wayland-protocols/include', + '-isystem $builddir/pkg/zlib/include', + '-isystem $basedir/pkg/openbsd/include', } pkg.deps = {diff --git a/pkg/netsurf/libdom/gen.lua b/pkg/netsurf/libdom/gen.lua@@ -4,7 +4,7 @@ cflags{ '-I $basedir/pkg/netsurf/libhubbub/src/include', '-I $basedir/pkg/netsurf/libparserutils/src/include', '-I $basedir/pkg/netsurf/libwapcaplet/src/include', - '-I $builddir/pkg/expat/include', + '-isystem $builddir/pkg/expat/include', } pkg.hdrs = copy('$outdir/include/dom', '$srcdir', {diff --git a/pkg/nginx/gen.lua b/pkg/nginx/gen.lua@@ -3,7 +3,7 @@ cflags{ '-I $srcdir/src/core', '-I $srcdir/src/event', '-I $srcdir/src/os/unix', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } local libs = {} pkg.deps = {'pkg/linux-headers/headers'} @@ -14,7 +14,7 @@ for line in iterlines('modules.txt') do end if modules['openssl'] then - cflags{'-I $builddir/pkg/libressl/include'} + cflags{'-isystem $builddir/pkg/libressl/include'} table.insert(libs, { '$builddir/pkg/libressl/libssl.a.d', '$builddir/pkg/libressl/libcrypto.a.d', @@ -22,7 +22,7 @@ if modules['openssl'] then table.insert(pkg.deps, 'pkg/libressl/headers') end if modules['regex'] then - cflags{'-I $builddir/pkg/pcre/include'} + cflags{'-isystem $builddir/pkg/pcre/include'} table.insert(libs, '$builddir/pkg/pcre/libpcre.a') table.insert(pkg.deps, 'pkg/pcre/headers') end @@ -34,7 +34,7 @@ for line in iterlines('ngx_auto_config.h', 1) do end end if zlib then - cflags{'-I $builddir/pkg/zlib/include'} + cflags{'-isystem $builddir/pkg/zlib/include'} table.insert(libs, '$builddir/pkg/zlib/libz.a') table.insert(pkg.deps, 'pkg/zlib/headers') enddiff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua@@ -47,7 +47,7 @@ man{'usr.bin/fmt/fmt.1'} -- nc sub('nc.ninja', function() - cflags{'-I $builddir/pkg/libtls-bearssl/include'} + cflags{'-isystem $builddir/pkg/libtls-bearssl/include'} exe('nc', [[ usr.bin/nc/(netcat.c atomicio.c socks.c) $builddir/pkg/libtls-bearssl/libtls.a.ddiff --git a/pkg/openntpd/gen.lua b/pkg/openntpd/gen.lua@@ -3,8 +3,8 @@ cflags{ '-include $dir/config.h', '-I $srcdir/src', '-I $srcdir/include', - '-I $basedir/pkg/openbsd/include', - '-I $builddir/pkg/libtls-bearssl/include', + '-isystem $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/libtls-bearssl/include', } pkg.deps = {diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua@@ -9,11 +9,11 @@ cflags{ archflags[arch] or '-D SANDBOX_RLIMIT=1', '-I $dir', '-I $srcdir', - '-I $basedir/pkg/openbsd/include', - '-I $builddir/pkg/bearssl/include', - '-I $builddir/pkg/libfido2/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/zlib/include', + '-isystem $basedir/pkg/openbsd/include', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/libfido2/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/zlib/include', '-idirafter $srcdir/openbsd-compat', }diff --git a/pkg/pigz/gen.lua b/pkg/pigz/gen.lua@@ -1,6 +1,6 @@ cflags{ '-Wall', '-Wextra', '-Wno-clobbered', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/zlib/include', } exe('pigz', [[diff --git a/pkg/pounce/gen.lua b/pkg/pounce/gen.lua@@ -1,7 +1,7 @@ cflags{ '-std=c11', '-Wall', '-Wextra', '-Wpedantic', '-D _GNU_SOURCE', - '-I $builddir/pkg/libtls-bearssl/include', + '-isystem $builddir/pkg/libtls-bearssl/include', } pkg.deps = {'pkg/libtls-bearssl/headers'}diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua@@ -3,7 +3,7 @@ cflags{ '-I $dir', '-I $srcdir/Include', '-I $srcdir/Include/internal', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {'pkg/linux-headers/headers'} @@ -11,12 +11,12 @@ local libs = {} local modules = load 'modules.lua' if modules['_ctypes'] then - cflags{'-I $builddir/pkg/libffi/include'} + cflags{'-isystem $builddir/pkg/libffi/include'} table.insert(pkg.deps, 'pkg/libffi/headers') table.insert(libs, 'libffi/libffi.a') end if modules['_hashlib'] or modules['_ssl'] then - cflags{'-I $builddir/pkg/libressl/include'} + cflags{'-isystem $builddir/pkg/libressl/include'} table.insert(pkg.deps, 'pkg/libressl/headers') table.insert(libs, { 'libressl/libssl.a', @@ -24,12 +24,12 @@ if modules['_hashlib'] or modules['_ssl'] then }) end if modules['pyexpat'] then - cflags{'-I $builddir/pkg/expat/include'} + cflags{'-isystem $builddir/pkg/expat/include'} table.insert(pkg.deps, 'pkg/expat/headers') table.insert(libs, 'expat/libexpat.a.d') end if modules['zlib'] then - cflags{'-I $builddir/pkg/zlib/include'} + cflags{'-isystem $builddir/pkg/zlib/include'} table.insert(pkg.deps, 'pkg/zlib/headers') table.insert(libs, 'zlib/libz.a') enddiff --git a/pkg/squashfs-tools-ng/gen.lua b/pkg/squashfs-tools-ng/gen.lua@@ -40,7 +40,7 @@ local srcs = paths[[ ]] if cfg.WITH_GZIP then - cflags{'-I $builddir/pkg/zlib/include'} + cflags{'-isystem $builddir/pkg/zlib/include'} table.insert(pkg.deps, 'pkg/zlib/headers') table.insert(srcs, { 'lib/sqfs/comp/gzip.c', @@ -49,7 +49,7 @@ if cfg.WITH_GZIP then end if cfg.WITH_ZSTD then - cflags{'-I $builddir/pkg/zstd/include'} + cflags{'-isystem $builddir/pkg/zstd/include'} table.insert(srcs, { 'lib/sqfs/comp/zstd.c', '$builddir/pkg/zstd/libzstd.a',diff --git a/pkg/sshfs/gen.lua b/pkg/sshfs/gen.lua@@ -1,7 +1,7 @@ cflags{ '-D FUSE_USE_VERSION=31', '-I $dir', - '-I $builddir/pkg/fuse/include', + '-isystem $builddir/pkg/fuse/include', } pkg.deps = {'pkg/fuse/headers'}diff --git a/pkg/st/gen.lua b/pkg/st/gen.lua@@ -1,13 +1,13 @@ cflags{ [[-D 'VERSION="0.7"']], '-I $dir', - '-I $builddir/pkg/fontconfig/include', - '-I $builddir/pkg/libxkbcommon/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/pixman/include', - '-I $builddir/pkg/wayland/include', - '-I $builddir/pkg/wayland-protocols/include', - '-I $builddir/pkg/wld/include', + '-isystem $builddir/pkg/fontconfig/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/wayland-protocols/include', + '-isystem $builddir/pkg/wld/include', } pkg.deps = {diff --git a/pkg/strace/gen.lua b/pkg/strace/gen.lua@@ -5,7 +5,7 @@ cflags{ '-I $srcdir/linux', '-I $srcdir', '-I $outdir', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } build('cat', '$outdir/config.h', {diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua@@ -6,15 +6,15 @@ cflags{ '-I $outdir', '-I $outdir/include', '-I $srcdir', - '-I $builddir/pkg/fontconfig/include', - '-I $builddir/pkg/libinput/include', - '-I $builddir/pkg/libxkbcommon/include', - '-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', - '-I $builddir/pkg/wld/include', + '-isystem $builddir/pkg/fontconfig/include', + '-isystem $builddir/pkg/libinput/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/libdrm/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/wayland-protocols/include', + '-isystem $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/wld/include', } cc('launch/protocol.c')diff --git a/pkg/syslinux/gen.lua b/pkg/syslinux/gen.lua@@ -8,7 +8,7 @@ cflags{ -- trashing the libinstaller/advconst.h symlink. '-I $srcdir/com32/include/syslinux', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/the_silver_searcher/gen.lua b/pkg/the_silver_searcher/gen.lua@@ -1,8 +1,8 @@ cflags{ '-D _GNU_SOURCE', '-I $dir', - '-I $builddir/pkg/pcre/include', - '-I $builddir/pkg/zlib/include', + '-isystem $builddir/pkg/pcre/include', + '-isystem $builddir/pkg/zlib/include', } pkg.deps = {diff --git a/pkg/tinyemu/gen.lua b/pkg/tinyemu/gen.lua@@ -5,9 +5,9 @@ cflags{ '-D CONFIG_SLIRP', '-D CONFIG_X86EMU', [[-D 'CONFIG_VERSION="2019-02-10"']], - '-I $builddir/pkg/bearssl/include', - '-I $builddir/pkg/curl/include', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/curl/include', + '-isystem $builddir/pkg/linux-headers/include', } pkg.deps = {diff --git a/pkg/transmission/gen.lua b/pkg/transmission/gen.lua@@ -34,16 +34,16 @@ end) cflags{ '-D __TRANSMISSION__', - '-I $builddir/pkg/bearssl/include', - '-I $builddir/pkg/curl/include', - '-I $builddir/pkg/libevent/include', - '-I $builddir/pkg/libutp/include', - '-I $builddir/pkg/zlib/include', '-I $dir', '-I $srcdir', '-I $srcdir/third-party', '-I $srcdir/third-party/libb64/include', '-I $srcdir/third-party/libnatpmp', + '-isystem $builddir/pkg/bearssl/include', + '-isystem $builddir/pkg/curl/include', + '-isystem $builddir/pkg/libevent/include', + '-isystem $builddir/pkg/libutp/include', + '-isystem $builddir/pkg/zlib/include', '-idirafter $basedir/pkg/openbsd/src/sys', '-include config.h', }diff --git a/pkg/u-boot/gen.lua b/pkg/u-boot/gen.lua@@ -2,7 +2,7 @@ cflags{ '-D USE_HOSTCC', '-I $dir', '-I $srcdir/tools', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', '-idirafter $srcdir/include', '-include $srcdir/include/compiler.h', }diff --git a/pkg/unzip/gen.lua b/pkg/unzip/gen.lua@@ -1,7 +1,7 @@ cflags{ '-include $dir/config.h', '-I $srcdir', - '-I $builddir/pkg/bzip2/include', + '-isystem $builddir/pkg/bzip2/include', } pkg.deps = {'pkg/bzip2/headers'}diff --git a/pkg/util-linux/gen.lua b/pkg/util-linux/gen.lua@@ -4,7 +4,7 @@ cflags{ '-I $outdir', '-I $srcdir/include', '-I $srcdir/libuuid/src', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', } build('cat', '$outdir/config.h', {diff --git a/pkg/velox/gen.lua b/pkg/velox/gen.lua@@ -1,14 +1,14 @@ cflags{ string.format([[-D 'VELOX_LIBEXEC="%s/libexec/velox"']], config.prefix), '-I $outdir', - '-I $builddir/pkg/fontconfig/include', - '-I $builddir/pkg/libinput/include', - '-I $builddir/pkg/libxkbcommon/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/pixman/include', - '-I $builddir/pkg/swc/include', - '-I $builddir/pkg/wayland/include', - '-I $builddir/pkg/wld/include', + '-isystem $builddir/pkg/fontconfig/include', + '-isystem $builddir/pkg/libinput/include', + '-isystem $builddir/pkg/libxkbcommon/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/swc/include', + '-isystem $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/wld/include', } waylandproto('protocol/velox.xml', {diff --git a/pkg/vis/gen.lua b/pkg/vis/gen.lua@@ -15,9 +15,9 @@ cflags{ string.format([[-D 'VIS_PATH="%s/share/vis"']], config.prefix), '-D NDEBUG', '-I $outdir', - '-I $builddir/pkg/libtermkey/include', - '-I $builddir/pkg/lua/include', - '-I $builddir/pkg/ncurses/include', + '-isystem $builddir/pkg/libtermkey/include', + '-isystem $builddir/pkg/lua/include', + '-isystem $builddir/pkg/ncurses/include', } build('copy', '$outdir/config.h', '$srcdir/config.def.h')diff --git a/pkg/wayland-protocols/gen.lua b/pkg/wayland-protocols/gen.lua@@ -1,4 +1,4 @@ -cflags{'-I $builddir/pkg/wayland/include'} +cflags{'-isystem $builddir/pkg/wayland/include'} waylandproto('stable/presentation-time/presentation-time.xml', { client='include/presentation-time-client-protocol.h',diff --git a/pkg/wayland/gen.lua b/pkg/wayland/gen.lua@@ -3,8 +3,8 @@ cflags{ '-I $outdir/include', '-I $srcdir', '-I $srcdir/src', - '-I $builddir/pkg/expat/include', - '-I $builddir/pkg/libffi/include', + '-isystem $builddir/pkg/expat/include', + '-isystem $builddir/pkg/libffi/include', } build('sed', '$outdir/include/wayland-version.h', '$srcdir/src/wayland-version.h.in', {diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua@@ -2,12 +2,12 @@ cflags{ '-D WITH_WAYLAND_SHM', '-D WITH_WAYLAND_DRM', '-I $outdir', - '-I $builddir/pkg/fontconfig/include', - '-I $builddir/pkg/freetype/include', - '-I $builddir/pkg/libdrm/include', - '-I $builddir/pkg/linux-headers/include', - '-I $builddir/pkg/pixman/include', - '-I $builddir/pkg/wayland/include', + '-isystem $builddir/pkg/fontconfig/include', + '-isystem $builddir/pkg/freetype/include', + '-isystem $builddir/pkg/libdrm/include', + '-isystem $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/pixman/include', + '-isystem $builddir/pkg/wayland/include', } pkg.hdrs = copy('$outdir/include/wld', '$srcdir', {'drm.h', 'pixman.h', 'wayland.h', 'wld.h'}) @@ -38,12 +38,12 @@ local libs = { } if config.video_drivers and config.video_drivers['intel'] then - cflags{'-D WITH_DRM_INTEL', '-I $basedir/pkg/libdrm/src/intel'} + cflags{'-D WITH_DRM_INTEL', '-isystem $basedir/pkg/libdrm/src/intel'} table.insert(srcs, {'intel.c', 'intel/batch.c'}) table.insert(libs, 'libdrm/libdrm_intel.a.d') end if config.video_drivers and config.video_drivers['nouveau'] then - cflags{'-D WITH_DRM_NOUVEAU', '-I $basedir/pkg/libdrm/src/nouveau'} + cflags{'-D WITH_DRM_NOUVEAU', '-isystem $basedir/pkg/libdrm/src/nouveau'} table.insert(srcs, 'nouveau.c') table.insert(libs, 'libdrm/libdrm_nouveau.a') enddiff --git a/src/gen.lua b/src/gen.lua@@ -5,7 +5,7 @@ cflags{ cc('devd.c', 'pkg/linux-headers/headers', {cflags={ '$cflags', - '-I $builddir/pkg/linux-headers/include', + '-isystem $builddir/pkg/linux-headers/include', string.format([[-D 'PREFIX="%s"']], config.prefix), }})