Skip to content

Commit d1ed17b

Browse files
aduh95aduh95
authored
build: remove default values for libname
By setting a default value, we override the pkg-config value, which is inconsistent with the other `--shared-*` flags. Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #66790 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent fcb1aa8 commit d1ed17b

3 files changed

Lines changed: 9 additions & 34 deletions

File tree

‎configure.py‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@
297297
shared_optgroup.add_argument('--shared-abseil-libname',
298298
action='store',
299299
dest='shared_abseil_libname',
300-
default=None,
301300
help='alternative lib name to link to [default: %(default)s]')
302301

303302
shared_optgroup.add_argument('--shared-abseil-libpath',
@@ -319,7 +318,6 @@
319318
shared_optgroup.add_argument('--shared-gtest-libname',
320319
action='store',
321320
dest='shared_gtest_libname',
322-
default='gtest_main,gtest',
323321
help='alternative lib name to link to [default: %(default)s]')
324322

325323
shared_optgroup.add_argument('--shared-gtest-libpath',
@@ -341,7 +339,6 @@
341339
shared_optgroup.add_argument('--shared-hdr-histogram-libname',
342340
action='store',
343341
dest='shared_hdr_histogram_libname',
344-
default='hdr_histogram',
345342
help='alternative lib name to link to [default: %(default)s]')
346343

347344
shared_optgroup.add_argument('--shared-hdr-histogram-libpath',
@@ -363,7 +360,6 @@
363360
shared_optgroup.add_argument('--shared-highway-libname',
364361
action='store',
365362
dest='shared_highway_libname',
366-
default='hwy',
367363
help='alternative lib name to link to [default: %(default)s]')
368364

369365
shared_optgroup.add_argument('--shared-highway-libpath',
@@ -385,7 +381,6 @@
385381
shared_optgroup.add_argument('--shared-http-parser-libname',
386382
action='store',
387383
dest='shared_http_parser_libname',
388-
default='llhttp',
389384
help='alternative lib name to link to [default: %(default)s]')
390385

391386
shared_optgroup.add_argument('--shared-http-parser-libpath',
@@ -407,7 +402,6 @@
407402
shared_optgroup.add_argument('--shared-libuv-libname',
408403
action='store',
409404
dest='shared_libuv_libname',
410-
default='uv',
411405
help='alternative lib name to link to [default: %(default)s]')
412406

413407
shared_optgroup.add_argument('--shared-libuv-libpath',
@@ -429,7 +423,6 @@
429423
shared_optgroup.add_argument('--shared-lief-libname',
430424
action='store',
431425
dest='shared_lief_libname',
432-
default='LIEF',
433426
help='alternative lib name to link to [default: %(default)s]')
434427

435428
shared_optgroup.add_argument('--shared-lief-libpath',
@@ -451,7 +444,6 @@
451444
shared_optgroup.add_argument('--shared-nbytes-libname',
452445
action='store',
453446
dest='shared_nbytes_libname',
454-
default='nbytes',
455447
help='alternative lib name to link to [default: %(default)s]')
456448

457449
shared_optgroup.add_argument('--shared-nbytes-libpath',
@@ -473,7 +465,6 @@
473465
shared_optgroup.add_argument('--shared-nghttp2-libname',
474466
action='store',
475467
dest='shared_nghttp2_libname',
476-
default='nghttp2',
477468
help='alternative lib name to link to [default: %(default)s]')
478469

479470
shared_optgroup.add_argument('--shared-nghttp2-libpath',
@@ -495,7 +486,6 @@
495486
shared_optgroup.add_argument('--shared-nghttp3-libname',
496487
action='store',
497488
dest='shared_nghttp3_libname',
498-
default='nghttp3',
499489
help='alternative lib name to link to [default: %(default)s]')
500490

501491
shared_optgroup.add_argument('--shared-nghttp3-libpath',
@@ -517,7 +507,6 @@
517507
shared_optgroup.add_argument('--shared-ngtcp2-libname',
518508
action='store',
519509
dest='shared_ngtcp2_libname',
520-
default='ngtcp2',
521510
help='alternative lib name to link to [default: %(default)s]')
522511

523512
shared_optgroup.add_argument('--shared-ngtcp2-libpath',
@@ -539,7 +528,6 @@
539528
shared_optgroup.add_argument('--shared-openssl-libname',
540529
action='store',
541530
dest='shared_openssl_libname',
542-
default='crypto,ssl',
543531
help='alternative lib name to link to [default: %(default)s]')
544532

545533
shared_optgroup.add_argument('--shared-openssl-libpath',
@@ -562,7 +550,6 @@
562550
shared_optgroup.add_argument('--shared-perfetto-libname',
563551
action='store',
564552
dest='shared_perfetto_libname',
565-
default='perfetto',
566553
help='alternative lib name to link to [default: %(default)s]')
567554

568555
shared_optgroup.add_argument('--shared-perfetto-libpath',
@@ -584,7 +571,6 @@
584571
shared_optgroup.add_argument('--shared-uvwasi-libname',
585572
action='store',
586573
dest='shared_uvwasi_libname',
587-
default='uvwasi',
588574
help='alternative lib name to link to [default: %(default)s]')
589575

590576
shared_optgroup.add_argument('--shared-uvwasi-libpath',
@@ -606,7 +592,6 @@
606592
shared_optgroup.add_argument('--shared-zlib-libname',
607593
action='store',
608594
dest='shared_zlib_libname',
609-
default='z',
610595
help='alternative lib name to link to [default: %(default)s]')
611596

612597
shared_optgroup.add_argument('--shared-zlib-libpath',
@@ -628,7 +613,6 @@
628613
shared_optgroup.add_argument('--shared-simdjson-libname',
629614
action='store',
630615
dest='shared_simdjson_libname',
631-
default='simdjson',
632616
help='alternative lib name to link to [default: %(default)s]')
633617

634618
shared_optgroup.add_argument('--shared-simdjson-libpath',
@@ -651,7 +635,6 @@
651635
shared_optgroup.add_argument('--shared-simdutf-libname',
652636
action='store',
653637
dest='shared_simdutf_libname',
654-
default='simdutf',
655638
help='alternative lib name to link to [default: %(default)s]')
656639

657640
shared_optgroup.add_argument('--shared-simdutf-libpath',
@@ -673,7 +656,6 @@
673656
shared_optgroup.add_argument('--shared-ada-libname',
674657
action='store',
675658
dest='shared_ada_libname',
676-
default='ada',
677659
help='alternative lib name to link to [default: %(default)s]')
678660

679661
shared_optgroup.add_argument('--shared-ada-libpath',
@@ -695,7 +677,6 @@
695677
shared_optgroup.add_argument('--shared-merve-libname',
696678
action='store',
697679
dest='shared_merve_libname',
698-
default='merve',
699680
help='alternative lib name to link to [default: %(default)s]')
700681

701682
shared_optgroup.add_argument('--shared-merve-libpath',
@@ -717,7 +698,6 @@
717698
shared_optgroup.add_argument('--shared-brotli-libname',
718699
action='store',
719700
dest='shared_brotli_libname',
720-
default='brotlidec,brotlienc',
721701
help='alternative lib name to link to [default: %(default)s]')
722702

723703
shared_optgroup.add_argument('--shared-brotli-libpath',
@@ -739,7 +719,6 @@
739719
shared_optgroup.add_argument('--shared-cares-libname',
740720
action='store',
741721
dest='shared_cares_libname',
742-
default='cares',
743722
help='alternative lib name to link to [default: %(default)s]')
744723

745724
shared_optgroup.add_argument('--shared-cares-libpath',
@@ -761,7 +740,6 @@
761740
shared_optgroup.add_argument('--shared-sqlite-libname',
762741
action='store',
763742
dest='shared_sqlite_libname',
764-
default='sqlite3',
765743
help='alternative lib name to link to [default: %(default)s]')
766744

767745
shared_optgroup.add_argument('--shared-sqlite-libpath',
@@ -783,7 +761,6 @@
783761
shared_optgroup.add_argument('--shared-ffi-libname',
784762
action='store',
785763
dest='shared_ffi_libname',
786-
default='ffi',
787764
help='alternative libffi name to link to [default: %(default)s]')
788765

789766
shared_optgroup.add_argument('--shared-ffi-libpath',
@@ -805,7 +782,6 @@
805782
shared_optgroup.add_argument('--shared-temporal_capi-libname',
806783
action='store',
807784
dest='shared_temporal_capi_libname',
808-
default='temporal_capi',
809785
help='alternative lib name to link to [default: %(default)s]')
810786

811787
shared_optgroup.add_argument('--shared-temporal_capi-libpath',
@@ -827,7 +803,6 @@
827803
shared_optgroup.add_argument('--shared-zstd-libname',
828804
action='store',
829805
dest='shared_zstd_libname',
830-
default='zstd',
831806
help='alternative lib name to link to [default: %(default)s]')
832807

833808
shared_optgroup.add_argument('--shared-zstd-libpath',
@@ -2229,12 +2204,15 @@ def configure_library(lib, output, pkgname=None, libraries_key='libraries', with
22292204
elif pkg_libpath:
22302205
libraries += [pkg_libpath]
22312206

2232-
default_libs = getattr(options, shared_lib + '_libname')
2207+
user_provided_value = getattr(options, shared_lib + '_libname')
22332208

2234-
if default_libs:
2235-
libraries += [f'-l{l}' for l in default_libs.split(',')]
2209+
if user_provided_value is not None:
2210+
libraries += [f'-l{l}' for l in user_provided_value.split(',')]
22362211
elif pkg_libs:
22372212
libraries += pkg_libs.split()
2213+
elif pkg_libs is None:
2214+
pkg = (pkgname or lib)
2215+
libraries += [f'-l{l}' for l in pkg] if isinstance(pkg, list) else f'-l${pkg}'
22382216

22392217

22402218
def configure_v8(o, configs):

‎tools/nix/non-v8-deps-mock.nix‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ symlinkJoin (finalAttrs: {
5959
"--without-ffi"
6060
"--without-ssl"
6161
]
62-
++ (lib.concatMap (sharedLibName: [
63-
"--shared-${sharedLibName}"
64-
"--shared-${sharedLibName}-libname="
65-
]) (builtins.attrNames sharedLibsToMock));
62+
++ map (sharedLibName: "--shared-${sharedLibName}") (builtins.attrNames sharedLibsToMock);
6663

6764
tests.pkg-config = testers.hasPkgConfigModules {
6865
package = finalAttrs.finalPackage;

‎tools/nix/sharedLibDeps.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
uvwasi = pkgs.uvwasi.overrideAttrs (old: {
4040
patches = old.patches ++ [
4141
(pkgs.fetchpatch2 {
42-
url = "https://github.com/nodejs/uvwasi/pull/326.patch";
43-
hash = "sha256-PPr62+qycCSfr1/JWXhJS6X8vW10ea2b4L4361tdwgE=";
42+
url = "https://github.com/nodejs/uvwasi/commit/fe602a6911207efd8dcfc070a752bcf76813c978.patch?full_index=1";
43+
hash = "sha256-MyFvRuEhcqZR+Bz2pY9vani8U1iyQrDeni2kKKnJGEI=";
4444
})
4545
];
4646

0 commit comments

Comments
 (0)