diff options
| -rw-r--r-- | pkg/expat/expat_config.h | 2 | ||||
| -rw-r--r-- | pkg/expat/gen.rc | 4 | ||||
| -rw-r--r-- | pkg/fontconfig/gen.rc | 2 | ||||
| -rw-r--r-- | pkg/netsurf/libdom/gen.rc | 2 | ||||
| -rw-r--r-- | pkg/python/gen.rc | 2 | ||||
| -rw-r--r-- | pkg/wayland/gen.rc | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/pkg/expat/expat_config.h b/pkg/expat/expat_config.h index 60db771b..b54cced4 100644 --- a/pkg/expat/expat_config.h +++ b/pkg/expat/expat_config.h @@ -1,7 +1,7 @@ #include <config-posix.h> #define BYTEORDER 1234 -/* #undef HAVE_ARC4RANDOM_BUF */ +#define HAVE_ARC4RANDOM_BUF 1 #define HAVE_BCOPY 1 #define HAVE_GETPAGESIZE 1 /* #undef HAVE_GETRANDOM */ diff --git a/pkg/expat/gen.rc b/pkg/expat/gen.rc index e1bb03c8..ee0b5d82 100644 --- a/pkg/expat/gen.rc +++ b/pkg/expat/gen.rc @@ -1,9 +1,11 @@ cflags\ -D HAVE_EXPAT_CONFIG_H\ + -isystem pkg/openbsd/include\ -I include\ -I '$dir' -lib libexpat.a expat/lib/^(xmlparse.c xmltok.c xmlrole.c) +lib libexpat.a expat/lib/^(xmlparse.c xmltok.c xmlrole.c)\ + '$builddir'/pkg/openbsd/libbsd.a.d hdrs=(expat.h expat_external.h) for(hdr in $hdrs) build '$outdir'/include/$hdr copy '$srcdir'/expat/lib/$hdr diff --git a/pkg/fontconfig/gen.rc b/pkg/fontconfig/gen.rc index 36b5d57e..f3e45e90 100644 --- a/pkg/fontconfig/gen.rc +++ b/pkg/fontconfig/gen.rc @@ -51,7 +51,7 @@ lib libfontconfig.a -d '$dir'/deps src/^(\ fcxml.c\ ftglue.c\ ) '$builddir'/pkg/^(\ - expat/libexpat.a\ + expat/libexpat.a.d\ freetype/libfreetype.a.d\ ) diff --git a/pkg/netsurf/libdom/gen.rc b/pkg/netsurf/libdom/gen.rc index 9c6d2fff..11d31ec0 100644 --- a/pkg/netsurf/libdom/gen.rc +++ b/pkg/netsurf/libdom/gen.rc @@ -57,7 +57,7 @@ lib libdom.a -d '$dir'/deps\ bindings/hubbub/parser.c\ bindings/xml/expat_xmlparser.c\ '$builddir'/pkg/^(\ - expat/libexpat.a\ + expat/libexpat.a.d\ netsurf/^(\ libhubbub/libhubbub.a.d\ libwapcaplet/libwapcaplet.a\ diff --git a/pkg/python/gen.rc b/pkg/python/gen.rc index 50e3c60d..6f048d31 100644 --- a/pkg/python/gen.rc +++ b/pkg/python/gen.rc @@ -140,7 +140,7 @@ if(grep -qE '^(_hashlib|_ssl)' Setup) { if(grep -q '^pyexpat' Setup) { cflags=($cflags -isystem '$builddir'/pkg/expat/include) deps=($deps pkg/expat/headers) - libs=($libs expat/libexpat.a) + libs=($libs expat/libexpat.a.d) } if(grep -q '^zlib' Setup) { cflags=($cflags -isystem '$builddir'/pkg/zlib/include) diff --git a/pkg/wayland/gen.rc b/pkg/wayland/gen.rc index f4816e21..89e27253 100644 --- a/pkg/wayland/gen.rc +++ b/pkg/wayland/gen.rc @@ -20,7 +20,7 @@ cc src/connection.c '||' pkg/libffi/headers exe wayland-scanner -d 'pkg/expat/headers $outdir/include/wayland-version.h' \ src/^(scanner.c wayland-util.c.o)\ - '$builddir'/pkg/expat/libexpat.a + '$builddir'/pkg/expat/libexpat.a.d file bin/wayland-scanner '$outdir'/wayland-scanner 755 waylandproto protocol/wayland.xml\ |