From 92e642f49e01da76dc965c8aedff08965e7f2ecf Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Thu, 9 May 2024 15:05:12 -0400 Subject: [PATCH 1/4] deps: enable unbundling of simdjson, simdutf, ada --- configure.py | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/configure.py b/configure.py index a8e48d08bc083b..086abfcd1ec794 100755 --- a/configure.py +++ b/configure.py @@ -404,6 +404,74 @@ dest='shared_zlib_libpath', help='a directory to search for the shared zlib DLL') +shared_optgroup.add_argument('--shared-simdjson', + action='store_true', + dest='shared_simdjson', + default=None, + help='link to a shared simdjson DLL instead of static linking') + +shared_optgroup.add_argument('--shared-simdjson-includes', + action='store', + dest='shared_simdjson_includes', + help='directory containing simdjson header files') + +shared_optgroup.add_argument('--shared-simdjson-libname', + action='store', + dest='shared_simdjson_libname', + default='z', + help='alternative lib name to link to [default: %(default)s]') + +shared_optgroup.add_argument('--shared-simdjson-libpath', + action='store', + dest='shared_simdjson_libpath', + help='a directory to search for the shared simdjson DLL') + + +shared_optgroup.add_argument('--shared-simdutf', + action='store_true', + dest='shared_simdutf', + default=None, + help='link to a shared simdutf DLL instead of static linking') + +shared_optgroup.add_argument('--shared-simdutf-includes', + action='store', + dest='shared_simdutf_includes', + help='directory containing simdutf header files') + +shared_optgroup.add_argument('--shared-simdutf-libname', + action='store', + dest='shared_simdutf_libname', + default='z', + help='alternative lib name to link to [default: %(default)s]') + +shared_optgroup.add_argument('--shared-simdutf-libpath', + action='store', + dest='shared_simdutf_libpath', + help='a directory to search for the shared simdutf DLL') + + +shared_optgroup.add_argument('--shared-ada', + action='store_true', + dest='shared_ada', + default=None, + help='link to a shared ada DLL instead of static linking') + +shared_optgroup.add_argument('--shared-ada-includes', + action='store', + dest='shared_ada_includes', + help='directory containing ada header files') + +shared_optgroup.add_argument('--shared-ada-libname', + action='store', + dest='shared_ada_libname', + default='z', + help='alternative lib name to link to [default: %(default)s]') + +shared_optgroup.add_argument('--shared-ada-libpath', + action='store', + dest='shared_ada_libpath', + help='a directory to search for the shared ada DLL') + shared_optgroup.add_argument('--shared-brotli', action='store_true', dest='shared_brotli', @@ -2056,6 +2124,9 @@ def make_bin_override(): configure_library('zlib', output) configure_library('http_parser', output) configure_library('libuv', output) +configure_library('ada', output) +configure_library('simdjson', output) +configure_library('simdutf', output) configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) configure_library('cares', output, pkgname='libcares') configure_library('nghttp2', output, pkgname='libnghttp2') From 53ca846c97d12e9c46809a1513d6db2acea25466 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Thu, 9 May 2024 16:21:07 -0400 Subject: [PATCH 2/4] Update configure.py Co-authored-by: Richard Lau --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 086abfcd1ec794..cf1e045282effa 100755 --- a/configure.py +++ b/configure.py @@ -464,7 +464,7 @@ shared_optgroup.add_argument('--shared-ada-libname', action='store', dest='shared_ada_libname', - default='z', + default='ada', help='alternative lib name to link to [default: %(default)s]') shared_optgroup.add_argument('--shared-ada-libpath', From fbc612dfe25d787877697657ceb53eba00794932 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Thu, 9 May 2024 16:21:16 -0400 Subject: [PATCH 3/4] Update configure.py Co-authored-by: Richard Lau --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index cf1e045282effa..7d63874751ea27 100755 --- a/configure.py +++ b/configure.py @@ -441,7 +441,7 @@ shared_optgroup.add_argument('--shared-simdutf-libname', action='store', dest='shared_simdutf_libname', - default='z', + default='simdutf', help='alternative lib name to link to [default: %(default)s]') shared_optgroup.add_argument('--shared-simdutf-libpath', From 2356b7db1fc4a5be445dca4de327fb9ec3185434 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Thu, 9 May 2024 16:21:23 -0400 Subject: [PATCH 4/4] Update configure.py Co-authored-by: Richard Lau --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 7d63874751ea27..e34b75d1984775 100755 --- a/configure.py +++ b/configure.py @@ -418,7 +418,7 @@ shared_optgroup.add_argument('--shared-simdjson-libname', action='store', dest='shared_simdjson_libname', - default='z', + default='simdjson', help='alternative lib name to link to [default: %(default)s]') shared_optgroup.add_argument('--shared-simdjson-libpath',