Skip to content

Commit

Permalink
DLPX-92903 gdb-python build fails on Ubuntu 24.04 because of deprecat…
Browse files Browse the repository at this point in the history
…ed python3-distutils dependency
  • Loading branch information
palash-gandhi committed Dec 7, 2024
1 parent 98170cd commit 135b515
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -63936,7 +63936,7 @@ config.status: configure
CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck

# Rebuilding configure.
AUTOCONF = autoconf
AUTOCONF = autoconf2.69
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
$(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 \
$(srcdir)/config/elf.m4 $(srcdir)/config/isl.m4 \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2082,7 +2082,7 @@ config.status: configure
CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck

# Rebuilding configure.
AUTOCONF = autoconf
AUTOCONF = autoconf2.69
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
$(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 \
$(srcdir)/config/elf.m4 $(srcdir)/config/isl.m4 \
Expand Down
16 changes: 0 additions & 16 deletions config/override.m4
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,6 @@ dnl Ensure exactly this Autoconf version is used
m4_ifndef([_GCC_AUTOCONF_VERSION],
[m4_define([_GCC_AUTOCONF_VERSION], [2.69])])
dnl Test for the exact version when AC_INIT is expanded.
dnl This allows one to update the tree in steps (for testing)
dnl by putting
dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
dnl in configure.ac before AC_INIT,
dnl without rewriting this file.
dnl Or for updating the whole tree at once with the definition above.
AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
m4_defn([m4_PACKAGE_VERSION]), [],
[m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
])
m4_define([AC_INIT], m4_defn([AC_INIT])[
_GCC_AUTOCONF_VERSION_CHECK
])
dnl Ensure we do not use a buggy M4.
m4_if(m4_index([..wi.d.], [.d.]), [-1],
Expand Down
3 changes: 1 addition & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Delphix Engineering <[email protected]>
Build-Depends:
autoconf,
autoconf2.69,
automake,
bison,
dh-python,
Expand All @@ -14,7 +14,6 @@ Build-Depends:
libsnappy1v5,
libtool,
pkg-config,
python3-distutils,
python3-future,
python3-pyelftools,
python3-dev,
Expand Down
2 changes: 1 addition & 1 deletion gdb/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -2068,7 +2068,7 @@ aclocal_m4_deps = \
$(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
AUTOCONF = autoconf
AUTOCONF = autoconf2.69
configure_deps = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(configure_deps)
cd $(srcdir) && $(AUTOCONF)
Expand Down
2 changes: 1 addition & 1 deletion libiberty/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ stamp-h: $(srcdir)/config.in config.status Makefile
config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck

AUTOCONF = autoconf
AUTOCONF = autoconf2.69
ACLOCAL = aclocal
ACLOCAL_AMFLAGS = -I ../config -I ..
aclocal_deps = \
Expand Down

0 comments on commit 135b515

Please sign in to comment.