From 03522a2764eeae7892228a821f9a1d5b0e33bdf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Mon, 27 Jan 2025 10:29:38 +0100 Subject: [PATCH] cleanup: GIO modules no longer used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Øyvind Harboe --- MODULE.bazel.lock | 28 ---------------------------- docker.BUILD.bazel | 6 ------ openroad.bzl | 9 +-------- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 80e4cf8..14cda24 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -110,34 +110,6 @@ ] } }, - "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": { - "general": { - "bzlTransitiveDigest": "PjIds3feoYE8SGbbIq2SFTZy3zmxeO2tQevJZNDo7iY=", - "usagesDigest": "+hz7IHWN6A1oVJJWNDB6yZRG+RYhF76wAYItpAeIUIg=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~//crosstool:setup.bzl", - "ruleClassName": "_apple_cc_autoconf_toolchains", - "attributes": {} - }, - "local_config_apple_cc": { - "bzlFile": "@@apple_support~//crosstool:setup.bzl", - "ruleClassName": "_apple_cc_autoconf", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [ - [ - "apple_support~", - "bazel_tools", - "bazel_tools" - ] - ] - } - }, "@@platforms//host:extension.bzl%host_platform": { "general": { "bzlTransitiveDigest": "xelQcPZH8+tmuOHVjL9vDxMnnQNMlwj0SlvgoqBkm4U=", diff --git a/docker.BUILD.bazel b/docker.BUILD.bazel index 9d89e18..8327dbb 100644 --- a/docker.BUILD.bazel +++ b/docker.BUILD.bazel @@ -20,12 +20,6 @@ filegroup( visibility = ["//visibility:public"], ) -filegroup( - name = "gio_modules", - srcs = glob(["usr/lib/x86_64-linux-gnu/gio/modules/*.so"]), - visibility = ["//visibility:public"], -) - filegroup( name = "ld.so", srcs = ["lib64/ld-linux-x86-64.so.2"], diff --git a/openroad.bzl b/openroad.bzl index 5118e7a..7cd3ed0 100644 --- a/openroad.bzl +++ b/openroad.bzl @@ -179,8 +179,7 @@ def flow_inputs(ctx): ctx.files._ruby_dynamic + ctx.files._tcl + ctx.files._opengl + - ctx.files._qt_plugins + - ctx.files._gio_modules, + ctx.files._qt_plugins, transitive = [ ctx.attr._openroad[DefaultInfo].default_runfiles.files, ctx.attr._openroad[DefaultInfo].default_runfiles.symlinks, @@ -290,7 +289,6 @@ def flow_substitutions(ctx): return { "${DLN_LIBRARY_PATH}": commonpath(ctx.files._ruby_dynamic), "${FLOW_HOME}": ctx.file._makefile.dirname, - "${GIO_MODULE_DIR}": commonpath(ctx.files._gio_modules), "${KLAYOUT_PATH}": ctx.executable._klayout.path, "${LIBGL_DRIVERS_PATH}": commonpath(ctx.files._opengl), "${MAKEFILE_PATH}": ctx.file._makefile.path, @@ -422,11 +420,6 @@ def flow_attrs(): allow_files = True, default = Label("@docker_orfs//:qt_plugins"), ), - "_gio_modules": attr.label( - doc = "GIO modules.", - allow_files = True, - default = Label("@docker_orfs//:gio_modules"), - ), } | orfs_attrs() def yosys_only_attrs():