diff --git a/MODULE.bazel b/MODULE.bazel index 302a98db578..2b3591b6bfe 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -252,3 +252,13 @@ single_version_override( patches = ["//bazel:boost_context_disable_parse_headers.patch"], version = BOOST_VERSION, ) + +# Drop the abc -> readline dependency. The BCR overlay BUILD unconditionally +# adds @readline and ABC_USE_READLINE; OpenROAD drives abc programmatically +# and does not need the interactive line editor. +single_version_override( + module_name = "abc", + patch_strip = 1, + patches = ["//bazel:abc_no_readline.patch"], + version = "0.64-yosyshq.bcr.1", +) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 5fca85a80aa..b2a91f5fa0a 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -5,7 +5,6 @@ "https://bcr.bazel.build/modules/bant/0.2.10/MODULE.bazel": "1f74c3db56b4cfb85ec89250626712658092027dcda2e6082bddd41a7de7384a", "https://bcr.bazel.build/modules/bant/0.2.10/source.json": "6277f91fa835ecc8ec06ad8769ece86920e14cc1a0c77101e269a600fec47305", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", - "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/abc/0.62-yosyshq/MODULE.bazel": "325231df11fd3480cb0eb3c9095105ccdfacf34583c3a92d8c0ae46967dbaef6", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/abc/0.64-yosyshq.bcr.1/MODULE.bazel": "d1ed5b52014c8b7cf2b8a617f1c1f6e363303c92fd84c6c426281a873d0d297a", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/abc/0.64-yosyshq.bcr.1/source.json": "6c9a69d0cabbe23d1c42d8616405c2e64eabb84e53961872ba2b9ba634c1ffdc", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", @@ -579,7 +578,6 @@ "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/readline/8.2.bcr.3/MODULE.bazel": "800b9efaba7e9d9fdd204f459601002adb4eac33b13c4760c9e16169bf2307a8", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/readline/8.3.bcr.1/MODULE.bazel": "38dea764ad0ba793af4e6da1a9b6839922a56fe6620a0b3c42d3f0ca8cb714a4", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/readline/8.3.bcr.1/source.json": "a42bf1ff95df0203dc6f94c26ca86927bf6b2cb397b7888898666b9e57c37e78", - "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/readline/8.3/MODULE.bazel": "60b0062649137ab4c8a3521fd2a6976bcc65f16a5344c55b9132c80b361ddafe", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/rules_android/0.1.1/MODULE.bazel": "48809ab0091b07ad0182defb787c4c5328bd3a278938415c00a7b69b50c4d3a8", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/rules_android/0.1.1/source.json": "e6986b41626ee10bdc864937ffb6d6bf275bb5b9c65120e6137d56e6331f089e", "https://raw.githubusercontent.com/oharboe/bazel-central-registry/1beaf797951046d93a2f656d4238c954a21833e5/modules/rules_apple/3.13.0/MODULE.bazel": "b4559a2c6281ca3165275bb36c1f0ac74666632adc5bdb680e366de7ce845f43", diff --git a/bazel/abc_no_readline.patch b/bazel/abc_no_readline.patch new file mode 100644 index 00000000000..39770935a9b --- /dev/null +++ b/bazel/abc_no_readline.patch @@ -0,0 +1,18 @@ +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -1436,7 +1436,6 @@ + defines = [ + "ABC_USE_CUDD=1", + "ABC_USE_PTHREADS", +- "ABC_USE_READLINE", + "ABC_NAMESPACE=abc", + "ABC_USE_STDINT_H=1", + ], +@@ -1459,7 +1458,6 @@ + ], + visibility = ["//visibility:public"], + deps = [ +- "@readline", + "@zlib", + ], + )