diff options
Diffstat (limited to 'pkg')
46 files changed, 172 insertions, 172 deletions
diff --git a/pkg/acme-client/gen.rc b/pkg/acme-client/gen.rc index b5ab9549..b69b9bed 100644 --- a/pkg/acme-client/gen.rc +++ b/pkg/acme-client/gen.rc @@ -1,7 +1,7 @@ cflags\ -D _GNU_SOURCE\ - -isystem pkg/openbsd/include\ - -isystem '$builddir'/pkg/libressl/include + -I pkg/openbsd/include\ + -I '$builddir'/pkg/libressl/include exe acme-client -d pkg/libressl/headers\ acctproc.c\ diff --git a/pkg/alsa-utils/gen.rc b/pkg/alsa-utils/gen.rc index d22563c0..85dba088 100644 --- a/pkg/alsa-utils/gen.rc +++ b/pkg/alsa-utils/gen.rc @@ -1,8 +1,8 @@ cflags\ - -isystem '$builddir'/pkg/alsa-lib/include\ -I include\ -I '$dir' \ - -I '$srcdir'/include + -I '$srcdir'/include\ + -I '$builddir'/pkg/alsa-lib/include fn x { name=$1 diff --git a/pkg/bc/gen.rc b/pkg/bc/gen.rc index 2e651cf9..f3c01cc6 100644 --- a/pkg/bc/gen.rc +++ b/pkg/bc/gen.rc @@ -1,6 +1,6 @@ cflags\ -D HAVE_CONFIG_H\ - -isystem include\ + -I include\ -I '$dir' \ -I '$srcdir'/h diff --git a/pkg/curl/gen.rc b/pkg/curl/gen.rc index e483c595..03ab7ba6 100644 --- a/pkg/curl/gen.rc +++ b/pkg/curl/gen.rc @@ -1,13 +1,13 @@ cflags\ -D HAVE_CONFIG_H\ - -isystem '$builddir'/pkg/libressl/include\ - -isystem '$builddir'/pkg/zlib/include\ -I include\ -I '$dir' \ -I '$outdir'/include/curl\ -I '$outdir'/include\ -I '$srcdir'/lib\ - -I '$srcdir'/src + -I '$srcdir'/src\ + -I '$builddir'/pkg/libressl/include\ + -I '$builddir'/pkg/zlib/include hdrs=include/curl/^(\ curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h\ diff --git a/pkg/dmenu/gen.rc b/pkg/dmenu/gen.rc index 2275a31c..b9a70790 100644 --- a/pkg/dmenu/gen.rc +++ b/pkg/dmenu/gen.rc @@ -1,12 +1,12 @@ cflags\ -D 'VERSION=''"4.6"''' \ - -isystem pkg/fontconfig/src\ - -isystem pkg/libxkbcommon/src\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/swc/include\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem '$builddir'/pkg/wld/include\ - -I '$dir' + -I '$dir' \ + -I pkg/fontconfig/src\ + -I pkg/libxkbcommon/src\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/swc/include\ + -I '$builddir'/pkg/wayland/include\ + -I '$builddir'/pkg/wld/include phony deps\ '$builddir'/pkg/^(fontconfig libxkbcommon)^/fetch.stamp\ diff --git a/pkg/efibootmgr/gen.rc b/pkg/efibootmgr/gen.rc index dbdd0568..d4e2078b 100644 --- a/pkg/efibootmgr/gen.rc +++ b/pkg/efibootmgr/gen.rc @@ -1,8 +1,8 @@ cflags\ -D 'EFIBOOTMGR_VERSION=''"14"''' \ -D 'DEFAULT_LOADER=''"/linux"''' \ - -isystem '$builddir'/pkg/efivar/include\ - -I '$srcdir'/src/include + -I '$srcdir'/src/include\ + -I '$builddir'/pkg/efivar/include exe efibootmgr -d pkg/efivar/headers\ src/^(efibootmgr.c efi.c unparse_path.c)\ diff --git a/pkg/expat/gen.rc b/pkg/expat/gen.rc index 5a29ce32..1fe0b54a 100644 --- a/pkg/expat/gen.rc +++ b/pkg/expat/gen.rc @@ -1,8 +1,8 @@ cflags\ -D HAVE_EXPAT_CONFIG_H\ - -isystem pkg/openbsd/include\ -I include\ - -I '$dir' + -I '$dir' \ + -I pkg/openbsd/include lib libexpat.a expat/lib/^(loadlibrary.c xmlparse.c xmltok.c xmlrole.c)\ '$builddir'/pkg/openbsd/libbsd.a.d diff --git a/pkg/farbfeld/gen.rc b/pkg/farbfeld/gen.rc index d3e213dc..0a1438a4 100644 --- a/pkg/farbfeld/gen.rc +++ b/pkg/farbfeld/gen.rc @@ -1,8 +1,8 @@ cflags\ '-std=c99' -pedantic -Wall -Wextra\ -D _DEFAULT_SOURCE \ - -isystem '$builddir'/pkg/libjpeg-turbo/include\ - -isystem '$builddir'/pkg/libpng/include + -I '$builddir'/pkg/libjpeg-turbo/include\ + -I '$builddir'/pkg/libpng/include cc util.c diff --git a/pkg/ffmpeg/gen.rc b/pkg/ffmpeg/gen.rc index 1c053b1b..2f0d1010 100644 --- a/pkg/ffmpeg/gen.rc +++ b/pkg/ffmpeg/gen.rc @@ -4,12 +4,12 @@ cflags\ -Wno-deprecated-declarations\ -Wno-discarded-qualifiers\ -D HAVE_AV_CONFIG_H\ - -isystem '$builddir'/pkg/alsa-lib/include\ - -isystem '$builddir'/pkg/libressl/include\ -I '$dir' \ -I '$outdir'/include\ -I '$outdir'/internal\ - -I '$srcdir' + -I '$srcdir' \ + -I '$builddir'/pkg/alsa-lib/include\ + -I '$builddir'/pkg/libressl/include set nasmflags\ -i '$srcdir'/\ diff --git a/pkg/file/gen.rc b/pkg/file/gen.rc index 8afdb9db..62dd13c7 100644 --- a/pkg/file/gen.rc +++ b/pkg/file/gen.rc @@ -4,10 +4,10 @@ cflags\ -D HAVE_CONFIG_H\ -D 'MAGIC=''"/share/file/magic"''' \ -D _GNU_SOURCE\ - -isystem '$builddir'/pkg/zlib/include\ -I include\ -I '$dir' \ - -I '$outdir'/include + -I '$outdir'/include\ + -I '$builddir'/pkg/zlib/include build '$outdir'/include/magic.h sed '$srcdir'/src/magic.h.in ; with\ expr s,X.YY,`{echo $version | tr -d .}^, diff --git a/pkg/fontconfig/gen.rc b/pkg/fontconfig/gen.rc index f3e45e90..580a499e 100644 --- a/pkg/fontconfig/gen.rc +++ b/pkg/fontconfig/gen.rc @@ -1,11 +1,11 @@ cflags\ -D HAVE_CONFIG_H\ - -isystem '$builddir'/pkg/expat/include\ - -isystem pkg/freetype/src/include\ -I include\ -I '$dir' \ -I '$outdir' \ - -I '$srcdir' + -I '$srcdir' \ + -I pkg/freetype/src/include\ + -I '$builddir'/pkg/expat/include deps=(pkg/expat/headers '$builddir'/pkg/freetype/fetch.stamp) diff --git a/pkg/freetype/gen.rc b/pkg/freetype/gen.rc index f9390af9..ab4c1f49 100644 --- a/pkg/freetype/gen.rc +++ b/pkg/freetype/gen.rc @@ -5,10 +5,10 @@ cflags\ -D HAVE_FCNTL_H\ -D HAVE_STDINT_H\ -D HAVE_UNISTD_H\ - -isystem '$builddir'/pkg/zlib/include\ -I '$srcdir'/builds/unix\ -I '$srcdir'/include/freetype/config\ - -I '$srcdir'/include + -I '$srcdir'/include\ + -I '$builddir'/pkg/zlib/include cc src/gzip/ftgzip.c '||' pkg/zlib/headers lib libfreetype.a builds/unix/ftsystem.c src/^(\ diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc index 3e3a0e5d..2b8c0e2b 100644 --- a/pkg/git/gen.rc +++ b/pkg/git/gen.rc @@ -1,10 +1,10 @@ cflags\ -include '$dir'/config.h\ - -isystem '$builddir'/pkg/curl/include\ - -isystem '$builddir'/pkg/zlib/include\ -I '$srcdir' \ -I '$srcdir'/compat/regex\ - -I '$outdir' + -I '$outdir' \ + -I '$builddir'/pkg/curl/include\ + -I '$builddir'/pkg/zlib/include rule cmdlist 'wd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$wd/$in >$$wd/$out.tmp && mv $$wd/$out.tmp $$wd/$out' build '$outdir'/common-cmds.h cmdlist '$srcdir'/command-list.txt '|' '$srcdir'/Documentation/`{grep -v '^#' commands.txt} diff --git a/pkg/hostap/gen.rc b/pkg/hostap/gen.rc index 5c53f336..dbcd06a5 100644 --- a/pkg/hostap/gen.rc +++ b/pkg/hostap/gen.rc @@ -1,9 +1,9 @@ cflags\ -include '$dir'/config.h\ - -isystem '$builddir'/pkg/libressl/include\ - -isystem '$builddir'/pkg/libnl/include\ -I '$srcdir'/src/utils\ - -I '$srcdir'/src + -I '$srcdir'/src\ + -I '$builddir'/pkg/libressl/include\ + -I '$builddir'/pkg/libnl/include phony deps pkg/^(libressl libnl)^/headers diff --git a/pkg/less/gen.rc b/pkg/less/gen.rc index 7035e623..a9ec8473 100644 --- a/pkg/less/gen.rc +++ b/pkg/less/gen.rc @@ -1,7 +1,7 @@ cflags\ - -isystem '$builddir'/pkg/ncurses/include\ -I include\ - -I '$dir' + -I '$dir' \ + -I '$builddir'/pkg/ncurses/include cc version.c diff --git a/pkg/libass/gen.rc b/pkg/libass/gen.rc index 0918289e..bbaae83e 100644 --- a/pkg/libass/gen.rc +++ b/pkg/libass/gen.rc @@ -1,8 +1,8 @@ cflags\ - -isystem '$builddir'/pkg/fribidi/include\ - -isystem pkg/freetype/src/include\ -I include\ - -I '$dir' + -I '$dir' \ + -I pkg/freetype/src/include\ + -I '$builddir'/pkg/fribidi/include set nasmflags\ -w -orphan-labels\ diff --git a/pkg/libdrm/gen.rc b/pkg/libdrm/gen.rc index 26806e70..c833adeb 100644 --- a/pkg/libdrm/gen.rc +++ b/pkg/libdrm/gen.rc @@ -13,7 +13,7 @@ lib libdrm.a\ xf86drmMode.c if(~ intel $config_video_drivers) { - cflags -D 'HAVE_INTEL=1' -isystem pkg/libpciaccess/src/include + cflags -D 'HAVE_INTEL=1' -I pkg/libpciaccess/src/include lib libdrm_intel.a -d '$builddir'/pkg/libpciaccess/fetch.stamp intel/^(\ intel_bufmgr.c\ intel_bufmgr_fake.c\ diff --git a/pkg/libinput/gen.rc b/pkg/libinput/gen.rc index f77b3ffe..96219513 100644 --- a/pkg/libinput/gen.rc +++ b/pkg/libinput/gen.rc @@ -1,9 +1,9 @@ cflags\ '-std=c11' -Wall\ - -isystem pkg/libevdev/src\ - -isystem pkg/mtdev/src/include\ -I include\ - -I '$dir' + -I '$dir' \ + -I pkg/libevdev/src\ + -I pkg/mtdev/src/include phony deps '$builddir'/pkg/^(libevdev mtdev)^/fetch.stamp diff --git a/pkg/libnl/gen.rc b/pkg/libnl/gen.rc index 0499d580..90abf3ea 100644 --- a/pkg/libnl/gen.rc +++ b/pkg/libnl/gen.rc @@ -1,7 +1,7 @@ cflags\ -D _GNU_SOURCE\ -D 'SYSCONFDIR=''"/etc/libnl"''' \ - -isystem include\ + -I include\ -I '$dir' \ -I '$outdir'/include\ -I '$srcdir'/include\ diff --git a/pkg/libpng/gen.rc b/pkg/libpng/gen.rc index acd1b3a5..dba72103 100644 --- a/pkg/libpng/gen.rc +++ b/pkg/libpng/gen.rc @@ -1,9 +1,9 @@ cflags\ -D HAVE_CONFIG_H\ - -isystem '$builddir'/pkg/zlib/include\ -I include\ -I '$dir' \ - -I '$outdir'/include + -I '$outdir'/include\ + -I '$builddir'/pkg/zlib/include build '$outdir'/pnglibconf.tf4 awk '$srcdir'/^(pngconf.h scripts/pnglibconf.dfa pngusr.dfa) ; with\ expr '-f $srcdir/scripts/options.awk out=/dev/stdout version=search' diff --git a/pkg/libressl/gen.rc b/pkg/libressl/gen.rc index a9dddafc..6c7c15cb 100644 --- a/pkg/libressl/gen.rc +++ b/pkg/libressl/gen.rc @@ -6,13 +6,13 @@ cflags\ -D '__BEGIN_HIDDEN_DECLS=' \ -D '__END_HIDDEN_DECLS=' \ -D '''__warn_references(sym,msg)=''' \ - -isystem pkg/openbsd/include\ -I '$srcdir'/include\ -I '$srcdir'/crypto\ -I '$srcdir'/crypto/asn1\ -I '$srcdir'/crypto/bn\ -I '$srcdir'/crypto/evp\ - -I '$srcdir'/crypto/modes + -I '$srcdir'/crypto/modes\ + -I pkg/openbsd/include hdrs=include/^(\ tls.h\ diff --git a/pkg/libtermkey/gen.rc b/pkg/libtermkey/gen.rc index d2f2fdc8..e7f743aa 100644 --- a/pkg/libtermkey/gen.rc +++ b/pkg/libtermkey/gen.rc @@ -1,6 +1,6 @@ cflags\ '-std=c99' -Wall\ - -isystem '$builddir'/pkg/ncurses/include + -I '$builddir'/pkg/ncurses/include lib libtermkey.a -d pkg/ncurses/headers\ termkey.c driver-csi.c driver-ti.c\ diff --git a/pkg/lpeg/gen.rc b/pkg/lpeg/gen.rc index f193e30c..667c5f50 100644 --- a/pkg/lpeg/gen.rc +++ b/pkg/lpeg/gen.rc @@ -1,6 +1,6 @@ cflags\ '-std=c99' \ - -isystem pkg/lua/src/src + -I pkg/lua/src/src lib liblpeg.a -d '$builddir'/pkg/lua/fetch.stamp\ lpvm.c lpcap.c lptree.c lpcode.c lpprint.c diff --git a/pkg/mandoc/gen.rc b/pkg/mandoc/gen.rc index 02257117..65628046 100644 --- a/pkg/mandoc/gen.rc +++ b/pkg/mandoc/gen.rc @@ -1,8 +1,8 @@ cflags\ - -isystem pkg/openbsd/include\ - -isystem '$builddir'/pkg/zlib/include\ -I include\ - -I '$dir' + -I '$dir' \ + -I pkg/openbsd/include\ + -I '$builddir'/pkg/zlib/include lib libmandoc.a -d pkg/zlib/headers\ man.c\ diff --git a/pkg/mpv/gen.rc b/pkg/mpv/gen.rc index f4d04501..5ba8eb3e 100644 --- a/pkg/mpv/gen.rc +++ b/pkg/mpv/gen.rc @@ -1,11 +1,11 @@ cflags=(\ -D _GNU_SOURCE\ - -isystem '$builddir'/pkg/ffmpeg/include\ - -isystem '$builddir'/pkg/zlib/include\ - -isystem pkg/ffmpeg/src\ -I '$dir' \ -I '$outdir' \ -I '$srcdir' \ + -I pkg/ffmpeg/src\ + -I '$builddir'/pkg/ffmpeg/include\ + -I '$builddir'/pkg/zlib/include\ ) srcs=(\ @@ -52,29 +52,29 @@ for(f in assdraw defaults options osc ytdl_hook) file2string player/lua/$f.inc player/lua/$f.lua if(grep -qF 'HAVE_ALSA 1' config.h) { - cflags=($cflags -isystem '$builddir'/pkg/alsa-lib/include) + cflags=($cflags -I '$builddir'/pkg/alsa-lib/include) libs=($libs alsa-lib/libasound.a) deps=($deps pkg/alsa-lib/headers) } if(grep -qF 'HAVE_DRM 1' config.h) { - cflags=($cflags '-isystem pkg/libdrm/'^(src src/include/drm)) + cflags=($cflags '-I pkg/libdrm/'^(src src/include/drm)) libs=($libs libdrm/libdrm.a) deps=($deps '$builddir'/pkg/libdrm/fetch.stamp) } if(grep -qF 'HAVE_LIBASS 1' config.h) { - cflags=($cflags -isystem '$builddir'/pkg/libass/include) + cflags=($cflags -I '$builddir'/pkg/libass/include) libs=($libs libass/libass.a.d) deps=($deps pkg/libass/headers) } if(grep -qF 'HAVE_LUA 1' config.h) { - cflags=($cflags -isystem pkg/lua/src/src) + cflags=($cflags -I pkg/lua/src/src) libs=($libs lua/liblua.a) deps=($deps '$builddir'/pkg/lua/fetch.stamp) } if(grep -qF 'HAVE_WAYLAND 1' config.h) { cflags=($cflags\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem pkg/libxkbcommon/src\ + -I '$builddir'/pkg/wayland/include\ + -I pkg/libxkbcommon/src\ ) libs=($libs\ wayland/libwayland-^(client cursor)^.a.d\ diff --git a/pkg/msmtp/gen.rc b/pkg/msmtp/gen.rc index ff306d00..c46786e1 100644 --- a/pkg/msmtp/gen.rc +++ b/pkg/msmtp/gen.rc @@ -1,9 +1,9 @@ cflags\ -D HAVE_CONFIG_H\ -D 'SYSCONFDIR=\"/etc\"' \ - -isystem '$builddir'/pkg/libressl/include\ -I include\ -I '$dir' \ + -I '$builddir'/pkg/libressl/include exe msmtp -d pkg/libressl/headers src/^(\ conf.c\ diff --git a/pkg/mupdf/gen.rc b/pkg/mupdf/gen.rc index f500f32c..fcffe9c6 100644 --- a/pkg/mupdf/gen.rc +++ b/pkg/mupdf/gen.rc @@ -10,12 +10,12 @@ cflags\ -D NOTO_SMALL\ -D NOCJK\ -D SHARE_JPEG\ - -isystem pkg/freetype/src/include\ - -isystem pkg/jbig2dec/src\ - -isystem '$builddir'/pkg/libjpeg-turbo/include\ - -isystem '$builddir'/pkg/zlib/include\ -I '$srcdir'/include\ - -I '$outdir' + -I '$outdir' \ + -I pkg/freetype/src/include\ + -I pkg/jbig2dec/src\ + -I '$builddir'/pkg/libjpeg-turbo/include\ + -I '$builddir'/pkg/zlib/include { toolchain host @@ -56,16 +56,16 @@ exe bin/mutool -d '$dir'/deps source/tools/^(\ file bin/mutool '$outdir'/bin/mutool 755 cc platform/x11/curl_stream.c '||' pkg/curl/headers ; with\ - cflags '$cflags -isystem $builddir/pkg/curl/include' + cflags '$cflags -I $builddir/pkg/curl/include' phony wldeps\ '$dir'/deps\ '$builddir'/pkg/libxkbcommon/fetch.stamp\ pkg/^(pixman wayland wayland-protocols)^/headers cc platform/x11/wl_main.c '||' '$dir'/wldeps ; cflags=(\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem '$builddir'/pkg/wayland-protocols/include\ - -isystem pkg/libxkbcommon/src\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/wayland/include\ + -I '$builddir'/pkg/wayland-protocols/include\ + -I pkg/libxkbcommon/src\ ) with cflags '$cflags '$"cflags exe bin/mupdf -d '$dir'/deps platform/x11/^(pdfapp.c curl_stream.c.o wl_main.c.o)\ libmupdf.a.d\ diff --git a/pkg/netsurf/gen.rc b/pkg/netsurf/gen.rc index 9c6d97c2..a1083ee8 100644 --- a/pkg/netsurf/gen.rc +++ b/pkg/netsurf/gen.rc @@ -20,34 +20,34 @@ subgen nsgenbind # netsurf cflags\ -include '$dir'/config.h\ - -isystem '$builddir'/pkg/curl/include\ - -isystem '$builddir'/pkg/libjpeg-turbo/include\ - -isystem '$builddir'/pkg/libpng/include\ - -isystem '$builddir'/pkg/libressl/include\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem '$builddir'/pkg/wayland-protocols/include\ - -isystem '$builddir'/pkg/zlib/include\ - -isystem '$dir'/libcss/src/include\ - -isystem '$dir'/libdom/src/include\ - -isystem '$dir'/libhubbub/src/include\ - -isystem '$dir'/libnsbmp/src/include\ - -isystem '$dir'/libnsgif/src/include\ - -isystem '$dir'/libnsutils/src/include\ - -isystem '$dir'/libparserutils/src/include\ - -isystem '$dir'/libsvgtiny/src/include\ - -isystem '$dir'/libwapcaplet/src/include\ - -isystem pkg/freetype/src/include\ - -isystem pkg/libxkbcommon/src\ - -isystem pkg/openbsd/include\ - -isystem pkg/utf8proc/src\ -I '$dir' \ -I '$srcdir' \ -I '$srcdir'/include\ -I '$srcdir'/frontends\ -I '$srcdir'/content/handlers\ -I '$outdir' \ - -I '$outdir'/libdom/include + -I '$outdir'/libdom/include\ + -I '$builddir'/pkg/curl/include\ + -I '$builddir'/pkg/libjpeg-turbo/include\ + -I '$builddir'/pkg/libpng/include\ + -I '$builddir'/pkg/libressl/include\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/wayland/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\ + -I '$dir'/libnsbmp/src/include\ + -I '$dir'/libnsgif/src/include\ + -I '$dir'/libnsutils/src/include\ + -I '$dir'/libparserutils/src/include\ + -I '$dir'/libsvgtiny/src/include\ + -I '$dir'/libwapcaplet/src/include\ + -I pkg/freetype/src/include\ + -I pkg/libxkbcommon/src\ + -I pkg/openbsd/include\ + -I pkg/utf8proc/src gen_inputs=($gen_inputs '$dir'/nsgenbind.txt) ; checkstatus rule nsgenbind '$outdir/nsgenbind/nsgenbind -I $srcdir/content/handlers/javascript/WebIDL $in $outdir/duktape' ; with\ diff --git a/pkg/netsurf/libcss/gen.rc b/pkg/netsurf/libcss/gen.rc index f8c99161..7a04e997 100644 --- a/pkg/netsurf/libcss/gen.rc +++ b/pkg/netsurf/libcss/gen.rc @@ -1,8 +1,8 @@ cflags\ - -isystem pkg/netsurf/libparserutils/src/include\ - -isystem pkg/netsurf/libwapcaplet/src/include\ -I '$srcdir'/include\ - -I '$srcdir'/src + -I '$srcdir'/src\ + -I pkg/netsurf/libparserutils/src/include\ + -I pkg/netsurf/libwapcaplet/src/include { toolchain host diff --git a/pkg/netsurf/libdom/gen.rc b/pkg/netsurf/libdom/gen.rc index 11d31ec0..97e1b7ed 100644 --- a/pkg/netsurf/libdom/gen.rc +++ b/pkg/netsurf/libdom/gen.rc @@ -1,10 +1,10 @@ cflags\ - -isystem pkg/netsurf/libhubbub/src/include\ - -isystem pkg/netsurf/libparserutils/src/include\ - -isystem pkg/netsurf/libwapcaplet/src/include\ - -isystem '$builddir'/pkg/expat/include\ -I '$srcdir'/include\ - -I '$srcdir'/src + -I '$srcdir'/src\ + -I pkg/netsurf/libhubbub/src/include\ + -I pkg/netsurf/libparserutils/src/include\ + -I pkg/netsurf/libwapcaplet/src/include\ + -I '$builddir'/pkg/expat/include hdrs=bindings/^(hubbub/^(errors.h parser.h) xml/^(xmlerror.h xmlparser.h)) for(hdr in $hdrs) diff --git a/pkg/netsurf/libhubbub/gen.rc b/pkg/netsurf/libhubbub/gen.rc index 63cef77b..c83e0563 100644 --- a/pkg/netsurf/libhubbub/gen.rc +++ b/pkg/netsurf/libhubbub/gen.rc @@ -1,10 +1,10 @@ cflags\ - -isystem pkg/netsurf/libdom/src/include\ - -isystem pkg/netsurf/libparserutils/src/include\ - -isystem pkg/netsurf/libwapcaplet/src/include\ -I '$outdir' \ -I '$srcdir'/src\ - -I '$srcdir'/include + -I '$srcdir'/include\ + -I pkg/netsurf/libdom/src/include\ + -I pkg/netsurf/libparserutils/src/include\ + -I pkg/netsurf/libwapcaplet/src/include build '$outdir'/entities.inc awk '$srcdir'/build/Entities '|' '$dir'/entities.awk ; with\ expr '-f $dir/entities.awk' diff --git a/pkg/netsurf/libsvgtiny/gen.rc b/pkg/netsurf/libsvgtiny/gen.rc index dbb5b54e..49eb73d6 100644 --- a/pkg/netsurf/libsvgtiny/gen.rc +++ b/pkg/netsurf/libsvgtiny/gen.rc @@ -1,9 +1,9 @@ cflags\ - -isystem '$builddir'/pkg/netsurf/libdom/include\ - -isystem pkg/netsurf/libdom/src/include\ - -isystem pkg/netsurf/libwapcaplet/src/include\ -I '$srcdir'/include\ - -I '$srcdir'/src + -I '$srcdir'/src\ + -I pkg/netsurf/libdom/src/include\ + -I pkg/netsurf/libwapcaplet/src/include\ + -I '$builddir'/pkg/netsurf/libdom/include phony deps\ pkg/netsurf/libdom/headers\ diff --git a/pkg/openbsd/gen.rc b/pkg/openbsd/gen.rc index d6d25ea6..354c86f6 100644 --- a/pkg/openbsd/gen.rc +++ b/pkg/openbsd/gen.rc @@ -1,7 +1,7 @@ cflags=(\ -D '''DEF_WEAK(n)=''' \ - -isystem '$builddir'/pkg/libressl/include\ -I '$dir'/include\ + -I '$builddir'/pkg/libressl/include\ -idirafter '$srcdir'/include\ -idirafter '$srcdir'/sys\ ) @@ -9,10 +9,10 @@ libs=() switch($config_tls) { case libressl '' - cflags=($cflags -D USE_OPENSSL -isystem '$builddir'/pkg/libressl/include) + cflags=($cflags -D USE_OPENSSL -I '$builddir'/pkg/libressl/include) libs=($libs '$builddir'/pkg/libressl/libcrypto.a) case bearssl - cflags=($cflags -D USE_BEARSSL -isystem pkg/bearssl/src/inc) + cflags=($cflags -D USE_BEARSSL -I pkg/bearssl/src/inc) libs=($libs '$builddir'/pkg/bearssl/libbearssl.a) } diff --git a/pkg/openntpd/gen.rc b/pkg/openntpd/gen.rc index 8c4e6f8e..1eac3038 100644 --- a/pkg/openntpd/gen.rc +++ b/pkg/openntpd/gen.rc @@ -1,11 +1,11 @@ cflags\ -D _GNU_SOURCE\ -include '$dir'/config.h\ - -isystem pkg/openbsd/include\ - -isystem '$builddir'/pkg/libressl/include\ -I include\ -I '$srcdir'/src\ - -I '$srcdir'/include + -I '$srcdir'/include\ + -I pkg/openbsd/include\ + -I '$builddir'/pkg/libressl/include yacc parse '$srcdir'/src/parse.y exe ntpd -d pkg/libressl/headers\ diff --git a/pkg/openssh/gen.rc b/pkg/openssh/gen.rc index 79f3b935..d5a229c1 100644 --- a/pkg/openssh/gen.rc +++ b/pkg/openssh/gen.rc @@ -1,13 +1,13 @@ cflags\ -D '_XOPEN_SOURCE=600' \ -D _DEFAULT_SOURCE\ - -isystem pkg/openbsd/include\ - -isystem '$builddir'/pkg/libressl/include\ - -isystem '$builddir'/pkg/zlib/include\ -I include\ -I '$dir' \ -I '$srcdir' \ -I '$srcdir'/openbsd-compat\ + -I pkg/openbsd/include\ + -I '$builddir'/pkg/libressl/include\ + -I '$builddir'/pkg/zlib/include phony deps pkg/^(libressl zlib)^/headers diff --git a/pkg/pigz/gen.rc b/pkg/pigz/gen.rc index 7c0bb79e..f2967b61 100644 --- a/pkg/pigz/gen.rc +++ b/pkg/pigz/gen.rc @@ -1,6 +1,6 @@ cflags\ -Wall -Wextra\ - -isystem '$builddir'/pkg/zlib/include + -I '$builddir'/pkg/zlib/include exe pigz -d pkg/zlib/headers\ pigz.c yarn.c try.c\ diff --git a/pkg/python/gen.rc b/pkg/python/gen.rc index 6f048d31..f5c91c6b 100644 --- a/pkg/python/gen.rc +++ b/pkg/python/gen.rc @@ -128,22 +128,22 @@ libs=() deps=() if(grep -q '^_ctypes' Setup) { - cflags=($cflags -isystem '$builddir'/pkg/libffi/include) + cflags=($cflags -I '$builddir'/pkg/libffi/include) deps=($deps pkg/libffi/headers) libs=($libs libffi/libffi.a) } if(grep -qE '^(_hashlib|_ssl)' Setup) { - cflags=($cflags -isystem '$builddir'/pkg/libressl/include) + cflags=($cflags -I '$builddir'/pkg/libressl/include) deps=($deps pkg/libressl/headers) libs=($libs (libressl/^(libssl.a libcrypto.a) openbsd/libbsd.a)) } if(grep -q '^pyexpat' Setup) { - cflags=($cflags -isystem '$builddir'/pkg/expat/include) + cflags=($cflags -I '$builddir'/pkg/expat/include) deps=($deps pkg/expat/headers) libs=($libs expat/libexpat.a.d) } if(grep -q '^zlib' Setup) { - cflags=($cflags -isystem '$builddir'/pkg/zlib/include) + cflags=($cflags -I '$builddir'/pkg/zlib/include) deps=($deps pkg/zlib/headers) libs=($libs zlib/libz.a) } diff --git a/pkg/sshfs/gen.rc b/pkg/sshfs/gen.rc index ef906919..d78bf904 100644 --- a/pkg/sshfs/gen.rc +++ b/pkg/sshfs/gen.rc @@ -1,7 +1,7 @@ cflags\ -D 'FUSE_USE_VERSION=31' \ - -isystem pkg/libfuse/src/include\ - -I '$dir' + -I '$dir' \ + -I pkg/libfuse/src/include build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in ; exprs=(\ -e 's,@UNMOUNT_COMMAND@,''fusermount3 -u'',' \ diff --git a/pkg/st/gen.rc b/pkg/st/gen.rc index b44a733d..af3c562a 100644 --- a/pkg/st/gen.rc +++ b/pkg/st/gen.rc @@ -1,12 +1,12 @@ cflags\ -D 'VERSION=''"0.7"''' \ - -isystem pkg/fontconfig/src\ - -isystem pkg/libxkbcommon/src\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem '$builddir'/pkg/wayland-protocols/include\ - -isystem '$builddir'/pkg/wld/include\ - -I '$dir' + -I '$dir' \ + -I pkg/fontconfig/src\ + -I pkg/libxkbcommon/src\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/wayland/include\ + -I '$builddir'/pkg/wayland-protocols/include\ + -I '$builddir'/pkg/wld/include phony deps\ '$builddir'/pkg/^(fontconfig libxkbcommon)^/fetch.stamp\ diff --git a/pkg/swc/gen.rc b/pkg/swc/gen.rc index 582f2928..9f66923b 100644 --- a/pkg/swc/gen.rc +++ b/pkg/swc/gen.rc @@ -2,18 +2,18 @@ cflags\ -D _GNU_SOURCE\ -D 'screen_new=swc__screen_new' \ -D 'remove_resource=swc__remove_resource' \ - -isystem pkg/fontconfig/src\ - -isystem pkg/libdrm/src/include/drm\ - -isystem pkg/libdrm/src\ - -isystem pkg/libinput/src/src\ - -isystem pkg/libxkbcommon/src\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/wayland-protocols/include\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem '$builddir'/pkg/wld/include\ -I '$outdir' \ -I '$outdir'/include\ - -I '$srcdir' + -I '$srcdir' \ + -I pkg/fontconfig/src\ + -I pkg/libdrm/src/include/drm\ + -I pkg/libdrm/src\ + -I pkg/libinput/src/src\ + -I pkg/libxkbcommon/src\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/wayland-protocols/include\ + -I '$builddir'/pkg/wayland/include\ + -I '$builddir'/pkg/wld/include cc launch/protocol.c diff --git a/pkg/the_silver_searcher/gen.rc b/pkg/the_silver_searcher/gen.rc index d1ec91bc..22cdfca9 100644 --- a/pkg/the_silver_searcher/gen.rc +++ b/pkg/the_silver_searcher/gen.rc @@ -1,9 +1,9 @@ cflags\ -D _GNU_SOURCE\ - -isystem '$builddir'/pkg/pcre/include\ - -isystem '$builddir'/pkg/zlib/include\ -I include\ - -I '$dir' + -I '$dir' \ + -I '$builddir'/pkg/pcre/include\ + -I '$builddir'/pkg/zlib/include phony deps pkg/^(pcre zlib)^/headers exe ag -d '$dir'/deps src/^(\ diff --git a/pkg/unzip/gen.rc b/pkg/unzip/gen.rc index 07fb8e3c..ed8b1d2d 100644 --- a/pkg/unzip/gen.rc +++ b/pkg/unzip/gen.rc @@ -1,7 +1,7 @@ cflags\ -include '$dir'/config.h\ - -isystem pkg/bzip2/src\ - -I '$srcdir' + -I '$srcdir' \ + -I pkg/bzip2/src exe unzip -d '$builddir'/pkg/bzip2/fetch.stamp\ unzip.c crc32.c crypt.c envargs.c explode.c\ diff --git a/pkg/velox/gen.rc b/pkg/velox/gen.rc index 15c40f59..4f6fbed3 100644 --- a/pkg/velox/gen.rc +++ b/pkg/velox/gen.rc @@ -1,12 +1,12 @@ cflags\ -D 'VELOX_LIBEXEC=''"/libexec/velox"''' \ - -isystem pkg/fontconfig/src\ - -isystem pkg/libxkbcommon/src\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/swc/include\ - -isystem '$builddir'/pkg/wayland/include\ - -isystem '$builddir'/pkg/wld/include\ - -I '$outdir' + -I '$outdir' \ + -I pkg/fontconfig/src\ + -I pkg/libxkbcommon/src\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/swc/include\ + -I '$builddir'/pkg/wayland/include\ + -I '$builddir'/pkg/wld/include waylandproto protocol/velox.xml\ protocol/velox-^(client server)^-protocol.h velox-protocol.c diff --git a/pkg/vis/gen.rc b/pkg/vis/gen.rc index a208ea7f..cd4776e6 100644 --- a/pkg/vis/gen.rc +++ b/pkg/vis/gen.rc @@ -14,10 +14,10 @@ cflags\ -D 'VERSION=''"'$version'"''' \ -D 'VIS_PATH=''"/share/vis"''' \ -D NDEBUG\ - -isystem pkg/libtermkey/src\ - -isystem pkg/lua/src/src\ - -isystem '$builddir'/pkg/ncurses/include\ - -I '$outdir' + -I '$outdir' \ + -I pkg/libtermkey/src\ + -I pkg/lua/src/src\ + -I '$builddir'/pkg/ncurses/include build '$outdir'/config.h copy '$srcdir'/config.def.h diff --git a/pkg/wayland/gen.rc b/pkg/wayland/gen.rc index 89e27253..6295ef22 100644 --- a/pkg/wayland/gen.rc +++ b/pkg/wayland/gen.rc @@ -1,11 +1,11 @@ cflags\ - -isystem '$builddir'/pkg/expat/include\ - -isystem '$builddir'/pkg/libffi/include\ -I include\ -I '$dir' \ -I '$outdir'/include\ -I '$srcdir' \ - -I '$srcdir'/src + -I '$srcdir'/src\ + -I '$builddir'/pkg/expat/include\ + -I '$builddir'/pkg/libffi/include build '$outdir'/include/wayland-version.h sed '$srcdir'/src/wayland-version.h.in ; exprs=(\ -e s,@WAYLAND_VERSION_MAJOR@,1,\ diff --git a/pkg/wld/gen.rc b/pkg/wld/gen.rc index 957d5444..e166a21a 100644 --- a/pkg/wld/gen.rc +++ b/pkg/wld/gen.rc @@ -1,13 +1,13 @@ cflags=(\ -D WITH_WAYLAND_SHM\ -D WITH_WAYLAND_DRM\ - -isystem pkg/fontconfig/src\ - -isystem pkg/freetype/src/include\ - -isystem pkg/libdrm/src\ - -isystem pkg/libdrm/src/include/drm\ - -isystem '$builddir'/pkg/pixman/include\ - -isystem '$builddir'/pkg/wayland/include\ -I '$outdir' \ + -I pkg/fontconfig/src\ + -I pkg/freetype/src/include\ + -I pkg/libdrm/src\ + -I pkg/libdrm/src/include/drm\ + -I '$builddir'/pkg/pixman/include\ + -I '$builddir'/pkg/wayland/include\ ) hdrs=(drm.h pixman.h wayland.h wld.h) |