diff options
| author | Michael Forney <mforney@mforney.org> | 2020-10-01 13:25:16 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-10-01 13:36:42 -0700 |
| commit | 1f2e76986582463195a6710362d7fec9c2507ad0 (patch) | |
| tree | 93e316874e09c7699347c6845491a07db25131c9 /pkg/transmission | |
| parent | ceb251f15ad0c90dd4bdc7da4d6bf049e0578f95 (diff) | |
openbsd: Explicitly list the libc headers that are required
Previously, we just added the openbsd header directories to the
search path with -idirafter to prevent openbsd headers from being
used where we already have musl headers.
However, if the system had its own version of the headers (such as
sys/tree.h), those would get preferred over the openbsd versions,
which may result in build failures due to slight incompatibilities.
To fix this, just isolate the few headers we do need into their own
directory, and include it normally (with -I/-isystem).
Diffstat (limited to 'pkg/transmission')
| -rw-r--r-- | pkg/transmission/gen.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/transmission/gen.lua b/pkg/transmission/gen.lua index 15df199e..e671408e 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/miniupnpc', - '-idirafter $basedir/pkg/openbsd/src/sys', + '-isystem $outdir/pkg/openbsd/include', } build('sed', '$outdir/miniupnpc/miniupnpcstrings.h', '$srcdir/third-party/miniupnpc/miniupnpcstrings.h.in', { @@ -29,7 +29,7 @@ sub('libminiupnp.ninja', function() upnperrors.c upnpreplyparse.c ) - ]], {'$outdir/miniupnpc/miniupnpcstrings.h', 'pkg/openbsd/fetch'}) + ]], {'$outdir/miniupnpc/miniupnpcstrings.h', 'pkg/openbsd/headers'}) end) cflags{ @@ -44,7 +44,7 @@ cflags{ '-isystem $builddir/pkg/libevent/include', '-isystem $builddir/pkg/libutp/include', '-isystem $builddir/pkg/zlib/include', - '-idirafter $basedir/pkg/openbsd/src/sys', + '-isystem $builddir/pkg/openbsd/include', '-include config.h', } @@ -53,7 +53,7 @@ pkg.deps = { 'pkg/curl/headers', 'pkg/libevent/headers', 'pkg/libutp/headers', - 'pkg/openbsd/fetch', + 'pkg/openbsd/headers', 'pkg/zlib/headers', } |