Revert "[workspace] Deprecate the expat external (RobotLocomotion#20351…

…)" This reverts commit 3cfe0b0. This is a temporary crutch for rnv-based schema development. Eventually replace this with a source build of expat.
rpoyner-tri · Jan 5, 2024 · e51f740 · e51f740
1 parent b5e45dd
commit e51f740
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/setup/ubuntu/binary_distribution/packages-focal.txt b/setup/ubuntu/binary_distribution/packages-focal.txt
@@ -3,6 +3,7 @@ jupyter-notebook
 libblas3
 libdouble-conversion3
 libeigen3-dev
+libexpat1
 libfreetype6
 libgfortran5
 libglew2.1

diff --git a/setup/ubuntu/binary_distribution/packages-jammy.txt b/setup/ubuntu/binary_distribution/packages-jammy.txt
@@ -2,6 +2,7 @@ default-jre
 jupyter-notebook
 libblas-dev
 libeigen3-dev
+libexpat1
 libgfortran5
 libglib2.0-0
 libglx0

diff --git a/setup/ubuntu/source_distribution/packages-focal.txt b/setup/ubuntu/source_distribution/packages-focal.txt
@@ -3,6 +3,7 @@ file
 gfortran
 libblas-dev
 libclang-12-dev
+libexpat1-dev
 libgl-dev
 libglib2.0-dev
 libglx-dev

diff --git a/setup/ubuntu/source_distribution/packages-jammy.txt b/setup/ubuntu/source_distribution/packages-jammy.txt
@@ -2,6 +2,7 @@ default-jdk
 file
 gfortran
 libclang-14-dev
+libexpat1-dev
 libgl-dev
 libglib2.0-dev
 libglx-dev

diff --git a/tools/workspace/default.bzl b/tools/workspace/default.bzl
@@ -170,8 +170,6 @@ def add_default_repositories(excludes = [], mirrors = DEFAULT_MIRRORS):
     if "eigen" not in excludes:
         eigen_repository(name = "eigen")
     if "expat" not in excludes:
-        # The @expat external is deprecated in Drake's WORKSPACE and will be
-        # removed on or after 2024-02-01.
         expat_repository(name = "expat")
     if "fcl_internal" not in excludes:
         fcl_internal_repository(name = "fcl_internal", mirrors = mirrors)

diff --git a/tools/workspace/expat/repository.bzl b/tools/workspace/expat/repository.bzl
@@ -58,7 +58,6 @@ cc_library(
     includes = ["include"],
     linkopts = ["-lexpat"],
     visibility = ["//visibility:public"],
-    deprecation = "The @expat external is deprecated in Drake's WORKSPACE and will be removed on or after 2024-02-01.",  # noqa
 )
 """
 
@@ -77,7 +76,6 @@ expat_repository = repository_rule(
     # TODO(jamiesnape): Pass down licenses to setup_pkg_config_repository.
     attrs = {
         "modname": attr.string(default = "expat"),
-        "extra_deprecation": attr.string(default = "The @expat external is deprecated in Drake's WORKSPACE and will be removed on or after 2024-02-01."),  # noqa
     },
     local = True,
     configure = True,