From 1f2e76986582463195a6710362d7fec9c2507ad0 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Thu, 1 Oct 2020 13:25:16 -0700 Subject: 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). --- pkg/libevent/gen.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/libevent/gen.lua') diff --git a/pkg/libevent/gen.lua b/pkg/libevent/gen.lua index f1fd01dc..7b614e3e 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 $basedir/pkg/openbsd/src/sys', + '-isystem $builddir/pkg/openbsd/include', } build('sed', '$outdir/include/event2/event-config.h', {'$dir/config.h', '|', '$srcdir/make-event-config.sed'}, { @@ -24,7 +24,7 @@ pkg.hdrs = { } pkg.deps = { '$gendir/headers', - 'pkg/openbsd/fetch', + 'pkg/openbsd/headers', } lib('libevent.a', { -- cgit v1.2.3