logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: ed5d7b1e7bbe2dc4be9840c1b17fb3cbd3951e4c
parent be2c8e7105126933cfaa36b9315951e8ee8e14b3
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 26 Nov 2019 21:40:57 -0800

libfido2: Detect TLS support

Diffstat:

Mpkg/libfido2/config.h4+++-
Mpkg/libfido2/gen.lua8+++++++-
2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/libfido2/config.h b/pkg/libfido2/config.h @@ -1,4 +1,6 @@ -#define TLS _Thread_local +#ifdef HAVE__THREAD_LOCAL +# define TLS _Thread_local +#endif #define HAS_DEV_URANDOM #define HAVE_ENDIAN_H #define HAVE_ERR_H diff --git a/pkg/libfido2/gen.lua b/pkg/libfido2/gen.lua @@ -1,6 +1,6 @@ cflags{ '-std=c99', '-Wall', - '-include $dir/config.h', + '-include $outdir/config.h', '-D _DEFAULT_SOURCE', '-D _FIDO_INTERNAL', '-I $builddir/pkg/libcbor/include', @@ -15,10 +15,16 @@ pkg.hdrs = copy('$outdir/include', '$srcdir/src', { 'fido/param.h', }) pkg.deps = { + '$outdir/config.h', 'pkg/libcbor/headers', 'pkg/libressl/headers', } +build('cat', '$outdir/config.h', { + '$builddir/probe/HAVE__THREAD_LOCAL', + '$dir/config.h', +}) + lib('libfido2.a', [[ src/( aes256.c