summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/acme-client/gen.lua6
-rw-r--r--pkg/curl/gen.lua4
-rw-r--r--pkg/e2fsprogs/gen.lua2
-rw-r--r--pkg/elftoolchain/gen.lua2
-rw-r--r--pkg/ffmpeg/gen.lua6
-rw-r--r--pkg/file/gen.lua2
-rw-r--r--pkg/fribidi/gen.lua4
-rw-r--r--pkg/libcbor/gen.lua2
-rw-r--r--pkg/libevent/gen.lua4
-rw-r--r--pkg/libffi/gen.lua2
-rw-r--r--pkg/libfido2/gen.lua2
-rw-r--r--pkg/libjpeg-turbo/gen.lua2
-rw-r--r--pkg/libnl/gen.lua4
-rw-r--r--pkg/mupdf/gen.lua2
-rw-r--r--pkg/ncurses/gen.lua6
-rw-r--r--pkg/netsurf/gen.lua2
-rw-r--r--pkg/nginx/gen.lua2
-rw-r--r--pkg/openntpd/gen.lua2
-rw-r--r--pkg/openssh/gen.lua2
-rw-r--r--pkg/pcre/gen.lua2
-rw-r--r--pkg/pixman/gen.lua2
-rw-r--r--pkg/transmission/gen.lua4
-rw-r--r--pkg/wayland/gen.lua2
23 files changed, 34 insertions, 34 deletions
diff --git a/pkg/acme-client/gen.lua b/pkg/acme-client/gen.lua
index 18750cc3..01a72f8e 100644
--- a/pkg/acme-client/gen.lua
+++ b/pkg/acme-client/gen.lua
@@ -1,10 +1,10 @@
-set('srcdir', 'pkg/openbsd/src/usr.sbin/acme-client')
+set('srcdir', '$basedir/pkg/openbsd/src/usr.sbin/acme-client')
cflags{
'-D _GNU_SOURCE', -- for memmem
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
'-I $builddir/pkg/libressl/include',
'-I $srcdir',
- '-idirafter pkg/openbsd/src/sys',
+ '-idirafter $basedir/pkg/openbsd/src/sys',
}
pkg.deps = {
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
index a6c7bc96..1c07039b 100644
--- a/pkg/curl/gen.lua
+++ b/pkg/curl/gen.lua
@@ -33,7 +33,7 @@ pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', {
})
pkg.deps = {
'$outdir/curl_config.h',
- '$dir/headers',
+ '$gendir/headers',
'pkg/bearssl/headers',
'pkg/zlib/headers',
}
@@ -81,7 +81,7 @@ lib('libcurl.a', [[
]])
build('cc', '$outdir/tool_hugehelp.c.o', {
- '$dir/tool_hugehelp.c', '||', '$dir/deps', '$srcdir/src/tool_hugehelp.h',
+ '$dir/tool_hugehelp.c', '||', '$gendir/deps', '$srcdir/src/tool_hugehelp.h',
})
-- src/src/Makefile.inc:/^CURL_CFILES
diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua
index 671945bc..691bade9 100644
--- a/pkg/e2fsprogs/gen.lua
+++ b/pkg/e2fsprogs/gen.lua
@@ -71,7 +71,7 @@ pkg.hdrs = {
}
pkg.deps = {
'$outdir/config.h',
- '$dir/headers',
+ '$gendir/headers',
'$outdir/internal/blkid/blkid_types.h',
'$outdir/internal/support/prof_err.h',
'$outdir/internal/crc32c_table.h',
diff --git a/pkg/elftoolchain/gen.lua b/pkg/elftoolchain/gen.lua
index 5b34eb82..8e000a88 100644
--- a/pkg/elftoolchain/gen.lua
+++ b/pkg/elftoolchain/gen.lua
@@ -3,7 +3,7 @@ cflags{
'-I $dir',
'-I $srcdir/common',
'-I $srcdir/libelf',
- '-idirafter pkg/openbsd/src/sys',
+ '-idirafter $basedir/pkg/openbsd/src/sys',
}
pkg.hdrs = {
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua
index 7cdb2997..84c04056 100644
--- a/pkg/ffmpeg/gen.lua
+++ b/pkg/ffmpeg/gen.lua
@@ -30,7 +30,7 @@ pkg.hdrs = {
}
pkg.deps = {
'$outdir/config.asm',
- '$dir/headers',
+ '$gendir/headers',
'pkg/alsa-lib/headers',
'pkg/libtls-bearssl/headers',
'pkg/zlib/headers',
@@ -177,7 +177,7 @@ lib('libavfilter.a', {
'libavutil.a',
})
-cc('libavformat/protocols.c', {'$dir/deps', '$outdir/internal/libavformat/protocol_list.c'})
+cc('libavformat/protocols.c', {'$gendir/deps', '$outdir/internal/libavformat/protocol_list.c'})
lib('libavformat.a', {
expand{'libavformat/', {
'allformats.c',
@@ -352,7 +352,7 @@ local libs = {
'libswscale.a.d',
}
-cc('fftools/cmdutils.c', {'$dir/deps'})
+cc('fftools/cmdutils.c', {'$gendir/deps'})
exe('ffprobe', {paths[[fftools/(ffprobe.c cmdutils.c.o)]], libs})
file('bin/ffprobe', '755', '$outdir/ffprobe')
diff --git a/pkg/file/gen.lua b/pkg/file/gen.lua
index 633f01f8..2d0426d0 100644
--- a/pkg/file/gen.lua
+++ b/pkg/file/gen.lua
@@ -23,7 +23,7 @@ build('sed', '$outdir/file.1', '$srcdir/doc/file.man', {
})
pkg.hdrs = {'$outdir/include/magic.h'}
-pkg.deps = {'$dir/headers', 'pkg/zlib/headers'}
+pkg.deps = {'$gendir/headers', 'pkg/zlib/headers'}
lib('libmagic.a', [[src/(
buffer.c magic.c apprentice.c softmagic.c ascmagic.c
diff --git a/pkg/fribidi/gen.lua b/pkg/fribidi/gen.lua
index 41aeb20b..492437d1 100644
--- a/pkg/fribidi/gen.lua
+++ b/pkg/fribidi/gen.lua
@@ -24,7 +24,7 @@ sub('tools.ninja', function()
exe('gen-'..t..'-tab', expand{'gen.tab/', {
'gen-'..t..'-tab.c',
'packtab.c.o',
- }}, {'$dir/headers'})
+ }}, {'$gendir/headers'})
end
end)
@@ -79,7 +79,7 @@ pkg.deps = {
'$outdir/mirroring.tab.i',
'$outdir/brackets.tab.i',
'$outdir/brackets-type.tab.i',
- '$dir/headers',
+ '$gendir/headers',
}
lib('libfribidi.a', [[
diff --git a/pkg/libcbor/gen.lua b/pkg/libcbor/gen.lua
index fd0382c1..5ebb3067 100644
--- a/pkg/libcbor/gen.lua
+++ b/pkg/libcbor/gen.lua
@@ -36,7 +36,7 @@ pkg.hdrs = {
}),
'$outdir/include/cbor/configuration.h',
}
-pkg.deps = {'$dir/headers'}
+pkg.deps = {'$gendir/headers'}
lib('libcbor.a', [[
src/cbor.c
diff --git a/pkg/libevent/gen.lua b/pkg/libevent/gen.lua
index 901c5b1d..9dd5f4f7 100644
--- a/pkg/libevent/gen.lua
+++ b/pkg/libevent/gen.lua
@@ -2,7 +2,7 @@ cflags{
'-I $dir',
'-I $outdir/include',
'-I $srcdir/include',
- '-idirafter pkg/openbsd/src/sys',
+ '-idirafter $basedir/pkg/openbsd/src/sys',
}
build('sed', '$outdir/include/event2/event-config.h', {'$dir/config.h', '|', '$srcdir/make-event-config.sed'}, {
@@ -13,7 +13,7 @@ pkg.hdrs = {
'$outdir/include/event2/event-config.h',
}
pkg.deps = {
- '$dir/headers',
+ '$gendir/headers',
'pkg/openbsd/fetch',
}
diff --git a/pkg/libffi/gen.lua b/pkg/libffi/gen.lua
index f7f78382..8fd4e729 100644
--- a/pkg/libffi/gen.lua
+++ b/pkg/libffi/gen.lua
@@ -23,7 +23,7 @@ pkg.hdrs = {
lib('libffi.a', [[src/(
prep_cif.c types.c raw_api.c java_raw_api.c closures.c
x86/(ffi64.c unix64.S ffiw64.c win64.S)
-)]], {'$dir/headers'})
+)]], {'$gendir/headers'})
file('lib/libffi.a', '644', '$outdir/libffi.a')
fetch 'git'
diff --git a/pkg/libfido2/gen.lua b/pkg/libfido2/gen.lua
index fc393286..d1ecf459 100644
--- a/pkg/libfido2/gen.lua
+++ b/pkg/libfido2/gen.lua
@@ -6,7 +6,7 @@ cflags{
'-I $builddir/pkg/libcbor/include',
'-I $builddir/pkg/libressl/include',
'-I $srcdir/src',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
}
pkg.hdrs = copy('$outdir/include', '$srcdir/src', {
diff --git a/pkg/libjpeg-turbo/gen.lua b/pkg/libjpeg-turbo/gen.lua
index 9506742d..d2cd2a3e 100644
--- a/pkg/libjpeg-turbo/gen.lua
+++ b/pkg/libjpeg-turbo/gen.lua
@@ -9,7 +9,7 @@ build('cat', '$outdir/jconfigint.h', {
})
pkg.deps = {
- '$dir/headers',
+ '$gendir/headers',
'$outdir/jconfigint.h',
}
diff --git a/pkg/libnl/gen.lua b/pkg/libnl/gen.lua
index 7d9655cd..77faae0a 100644
--- a/pkg/libnl/gen.lua
+++ b/pkg/libnl/gen.lua
@@ -53,8 +53,8 @@ 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
-)]], {'$dir/headers'})
+)]], {'$gendir/headers'})
-lib('libnl-genl-3.a', 'lib/genl/(ctrl.c family.c genl.c mngt.c)', {'$dir/headers'})
+lib('libnl-genl-3.a', 'lib/genl/(ctrl.c family.c genl.c mngt.c)', {'$gendir/headers'})
fetch 'git'
diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
index d02166b6..b16cb00c 100644
--- a/pkg/mupdf/gen.lua
+++ b/pkg/mupdf/gen.lua
@@ -71,7 +71,7 @@ exe('bin/mutool', [[
file('bin/mutool', '755', '$outdir/bin/mutool')
cc('platform/x11/wl_main.c', {
- '$dir/deps',
+ '$gendir/deps',
'pkg/libxkbcommon/fetch',
'pkg/pixman/headers',
'pkg/wayland/headers',
diff --git a/pkg/ncurses/gen.lua b/pkg/ncurses/gen.lua
index ddfdc58b..27513a33 100644
--- a/pkg/ncurses/gen.lua
+++ b/pkg/ncurses/gen.lua
@@ -12,8 +12,8 @@ cflags{'$common_cflags'}
sub('tools.ninja', function()
toolchain 'host'
cflags{'$common_cflags', '-D USE_BUILD_CC'}
- exe('make_keys', {'ncurses/tinfo/make_keys.c'}, {'$dir/headers', '$outdir/names.c'})
- exe('make_hash', {'ncurses/tinfo/make_hash.c'}, {'$dir/headers', '$outdir/hashsize.h'})
+ exe('make_keys', {'ncurses/tinfo/make_keys.c'}, {'$gendir/headers', '$outdir/names.c'})
+ exe('make_hash', {'ncurses/tinfo/make_hash.c'}, {'$gendir/headers', '$outdir/hashsize.h'})
end)
build('sed', '$outdir/curses.head', {'$srcdir/include/curses.h.in', '|', '$dir/subst.sed'}, {
@@ -93,7 +93,7 @@ pkg.hdrs = {
install=true,
}
pkg.deps = {
- '$dir/headers',
+ '$gendir/headers',
'$outdir/hashsize.h',
'$outdir/init_keytry.h',
'$outdir/ncurses_def.h',
diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
index 8b6cdf44..3c09326c 100644
--- a/pkg/netsurf/gen.lua
+++ b/pkg/netsurf/gen.lua
@@ -52,7 +52,7 @@ cflags{
pkg.deps = {
'$dir/libcss/fetch',
'$dir/libdom/fetch',
- '$dir/libdom/headers',
+ '$gendir/libdom/headers',
'$dir/libhubbub/fetch',
'$dir/libnsbmp/fetch',
'$dir/libnsgif/fetch',
diff --git a/pkg/nginx/gen.lua b/pkg/nginx/gen.lua
index 20db8a79..a28261d8 100644
--- a/pkg/nginx/gen.lua
+++ b/pkg/nginx/gen.lua
@@ -50,7 +50,7 @@ end
build('awk', '$outdir/ngx_modules.c', {'$dir/modules.txt', '|', '$dir/modules.awk', '$dir/sources.txt'}, {
expr='-f $dir/modules.awk -v sources=$dir/sources.txt'
})
-cc('$outdir/ngx_modules.c', {'$dir/deps', '$dir/fetch'})
+cc('$outdir/ngx_modules.c', {'$gendir/deps', '$dir/fetch'})
local sources = paths[[src/(
core/(
diff --git a/pkg/openntpd/gen.lua b/pkg/openntpd/gen.lua
index fd7d196d..7b559204 100644
--- a/pkg/openntpd/gen.lua
+++ b/pkg/openntpd/gen.lua
@@ -3,7 +3,7 @@ cflags{
'-include $dir/config.h',
'-I $srcdir/src',
'-I $srcdir/include',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
'-I $builddir/pkg/libtls-bearssl/include',
}
diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua
index 981f38e0..9c456ae6 100644
--- a/pkg/openssh/gen.lua
+++ b/pkg/openssh/gen.lua
@@ -9,7 +9,7 @@ cflags{
archflags[config.target.toolchain:match('[^-]*')] or '-D SANDBOX_RLIMIT=1',
'-I $dir',
'-I $srcdir',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
'-I $builddir/pkg/libfido2/include',
'-I $builddir/pkg/libressl/include',
'-I $builddir/pkg/zlib/include',
diff --git a/pkg/pcre/gen.lua b/pkg/pcre/gen.lua
index 190984a7..de9f989e 100644
--- a/pkg/pcre/gen.lua
+++ b/pkg/pcre/gen.lua
@@ -38,6 +38,6 @@ lib('libpcre.a', {
'pcre_version.c',
'pcre_xclass.c',
'$outdir/pcre_chartables.c',
-}, {'$dir/headers'})
+}, {'$gendir/headers'})
fetch 'curl'
diff --git a/pkg/pixman/gen.lua b/pkg/pixman/gen.lua
index caf3660f..2c83a6ea 100644
--- a/pkg/pixman/gen.lua
+++ b/pkg/pixman/gen.lua
@@ -23,7 +23,7 @@ pkg.hdrs = {
'$outdir/include/pixman-version.h',
}
pkg.deps = {
- '$dir/headers',
+ '$gendir/headers',
'$outdir/config.h',
}
diff --git a/pkg/transmission/gen.lua b/pkg/transmission/gen.lua
index 0c00a1f2..6852fb8d 100644
--- a/pkg/transmission/gen.lua
+++ b/pkg/transmission/gen.lua
@@ -6,7 +6,7 @@ sub('libminiupnp.ninja', function()
cflags{
'-D _GNU_SOURCE',
'-I $outdir/miniupnp',
- '-idirafter pkg/openbsd/src/sys',
+ '-idirafter $basedir/pkg/openbsd/src/sys',
}
build('sed', '$outdir/miniupnp/miniupnpcstrings.h', '$srcdir/third-party/miniupnp/miniupnpcstrings.h.in', {
@@ -43,7 +43,7 @@ cflags{
'-I $srcdir/third-party/libnatpmp',
'-I $basedir/pkg/libevent/src/include',
'-I $basedir/pkg/libutp/src',
- '-idirafter pkg/openbsd/src/sys',
+ '-idirafter $basedir/pkg/openbsd/src/sys',
'-include config.h',
}
diff --git a/pkg/wayland/gen.lua b/pkg/wayland/gen.lua
index 8fa8f080..10633381 100644
--- a/pkg/wayland/gen.lua
+++ b/pkg/wayland/gen.lua
@@ -36,7 +36,7 @@ pkg.hdrs = {
'$outdir/include/wayland-version.h',
}
pkg.deps = {
- '$dir/headers',
+ '$gendir/headers',
'$outdir/include/wayland-version.h',
'pkg/libffi/headers',
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-12 19:41:10 +0000