diff mbox series

Remove LIBINTL_DEP

Message ID	ZnPwhfqSPOsbUxZ7@squeak.grove.modra.org
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 33670388A414 Date: Thu, 20 Jun 2024 18:34:05 +0930 From: Alan Modra <amodra@gmail.com> To: binutils@sourceware.org, gdb-patches@sourceware.org Subject: Remove LIBINTL_DEP Message-ID: <ZnPwhfqSPOsbUxZ7@squeak.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: list Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org
Series	Remove LIBINTL_DEP \| Remove LIBINTL_DEP

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm	fail	Patch failed to apply
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64	fail	Patch failed to apply

Commit Message

Alan Modra June 20, 2024, 9:04 a.m. UTC

  The intl directory in the source no longer exists.  LIBINTL_DEP is
thus always empty.  Remove references to it.

config/
	* gettext-sister.m4: Don't AC_SUBST LIBINTL_DEP.
bfd/
	* Makefile.in: Regenerate.
	* configure: Regenerate.
binutils/
	* Makefile.am (*_DEPENDENCIES): Remove LIBINTL_DEP.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
gas/
	* Makefile.am (as_new_DEPENDENCIES): Remove LIBINTL_DEP.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
gdb/
	* Makefile.in (INTL_DEPS): Don't set or reference.
	* configure: Regenerate.
gdbserver/
	* Makefile.in (INTL_DEPS): Don't set or reference.
gdbsupport/
	* Makefile.in: Regenerate.
	* configure: Regenerate.
gold/
	* Makefile.am (deps_var): Remove LIBINTL_DEP.
	(incremental_dump_DEPENDENCIES, dwp_DEPENDENCIES): Likewise.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* testsuite/Makefile.am (DEPENDENCIES): Remove LIBINTL_DEP.
	* testsuite/Makefile.in: Regenerate.
gprof/
	* Makefile.am (gprof_DEPENDENCIES): Remove LIBINTL_DEP.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
ld/
	* Makefile.am (ld_new_DEPENDENCIES): Remove LIBINTL_DEP.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
libctf/
	* Makefile.in: Regenerate.
	* configure: Regenerate.
opcodes/
	* configure.ac (BUILD_LIBS): Remove LIBINTL.
	(BUILD_LIB_DEPS): Remove LIBINTL_DEP.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

Comments

Arsen Arsenović June 20, 2024, 9:31 a.m. UTC | #1

Hi Alan,

Alan Modra <amodra@gmail.com> writes:

> The intl directory in the source no longer exists.  LIBINTL_DEP is
> thus always empty.  Remove references to it.

That's not the case, though - it can be populated by gettext-runtimes
uninstalled-config.sh via ZW_GNU_GETTEXT_SISTER_DIR.

Are you sure the build still works unchanged without this variable?
Could you try configuring with in-tree gettext 0.22 or later to check if
it still works and the proper dependencies are emitted?  I suspect they
won't be, but that the build will work due to the toplevel dependencies.

TIA, Have a lovely day!

Mark Wielaard June 20, 2024, 11:12 a.m. UTC | #2

Hi Alan,

On Thu, 2024-06-20 at 18:34 +0930, Alan Modra wrote:
> The intl directory in the source no longer exists.  LIBINTL_DEP is
> thus always empty.  Remove references to it.
> gdb/
> 	* Makefile.in (INTL_DEPS): Don't set or reference.
> 	* configure: Regenerate.
> gdbserver/
> 	* Makefile.in (INTL_DEPS): Don't set or reference.
> gdbsupport/
> 	* Makefile.in: Regenerate.
> 	* configure: Regenerate.

The binutils-gdb-autoregen bot claims configure in gdbserver/ also
needs to be regenerated:
https://builder.sourceware.org/buildbot/#/builders/270/builds/2527

diff --git a/gdbserver/configure b/gdbserver/configure
index 3abc647acda..5a76f96cf08 100755
--- a/gdbserver/configure
+++ b/gdbserver/configure
@@ -647,7 +647,6 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
-LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -12945,7 +12944,6 @@ fi
 
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is
requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

Cheers,

Mark

Alan Modra June 20, 2024, 11:43 a.m. UTC | #3

On Thu, Jun 20, 2024 at 11:31:38AM +0200, Arsen Arsenović wrote:
> Hi Alan,
> 
> Alan Modra <amodra@gmail.com> writes:
> 
> > The intl directory in the source no longer exists.  LIBINTL_DEP is
> > thus always empty.  Remove references to it.
> 
> That's not the case, though - it can be populated by gettext-runtimes
> uninstalled-config.sh via ZW_GNU_GETTEXT_SISTER_DIR.

Oh.

> Are you sure the build still works unchanged without this variable?
> Could you try configuring with in-tree gettext 0.22 or later to check if
> it still works and the proper dependencies are emitted?  I suspect they
> won't be, but that the build will work due to the toplevel dependencies.

It works for me, but that's likely because my uninstalled-config.sh
has

if test no = yes; then
  LIBINTL_DEP="${relative_builddir}/intl/libintl.la"
else
  LIBINTL_DEP=
fi

Hmm, seems I need to configure using --with-included-gettext, and then
the opcodes compile fails because I took LIBINTL out of BUILD_LIBS.
Putting it back in succeeds but if you are building intl in tree then
you really ought to have LIBINTL_DEP.

So the patch is just plain wrong.  Reverting.

Alan Modra June 20, 2024, 11:50 a.m. UTC | #4

On Thu, Jun 20, 2024 at 01:12:09PM +0200, Mark Wielaard wrote:
> The binutils-gdb-autoregen bot claims configure in gdbserver/ also
> needs to be regenerated:

Huh, I built with --enable-maintainer-mode, which ought to have
regenerated configure.  Maybe there is a bug in gdb's
--enable-maintainer-mode?

Mark Wielaard June 20, 2024, 4:51 p.m. UTC | #5

Hi Alan,

On Thu, 2024-06-20 at 21:20 +0930, Alan Modra wrote:
> On Thu, Jun 20, 2024 at 01:12:09PM +0200, Mark Wielaard wrote:
> > The binutils-gdb-autoregen bot claims configure in gdbserver/ also
> > needs to be regenerated:
> 
> Huh, I built with --enable-maintainer-mode, which ought to have
> regenerated configure.  Maybe there is a bug in gdb's
> --enable-maintainer-mode?

I looked a bit, but must admit it is all a little voodoo. I think it is
a bug somewhere, because I cannot make it regenerate configure inside
the gdbserver directory even when when giving --enable-maintainer-mode
to the top-level configure and I can see it being passed down to the
gdbserver/configure.

The autoregen bit gets this "right" by just "manually" forcing an
autoreconf -f inside the gdbserver directory.

Cheers,

Mark

Andreas Schwab June 20, 2024, 8:02 p.m. UTC | #6

On Jun 20 2024, Mark Wielaard wrote:

> I looked a bit, but must admit it is all a little voodoo. I think it is
> a bug somewhere, because I cannot make it regenerate configure inside
> the gdbserver directory even when when giving --enable-maintainer-mode
> to the top-level configure and I can see it being passed down to the
> gdbserver/configure.

Since gdbserver does not use automake all rules need to be written
manually.

diff mbox series

Patch

diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4
index 5bb385fd0de..960bf873c93 100644
--- a/config/gettext-sister.m4
+++ b/config/gettext-sister.m4
@@ -28,7 +28,6 @@  m4_popdef([gettext_builddir])
 
 AC_SUBST([USE_NLS])
 AC_SUBST([LIBINTL])
-AC_SUBST([LIBINTL_DEP])
 AC_SUBST([INCINTL])
 AC_SUBST([XGETTEXT])
 AC_SUBST([GMSGFMT])
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index ad571b60546..4bc61918b47 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -226,30 +226,28 @@  development.exp: $(BFDDIR)/development.sh
 installcheck-local:
 	/bin/sh $(srcdir)/sanity.sh $(bindir)
 
-# There's no global DEPENDENCIES.  So, we must explicitly list everything
-# which depends on libintl, since we don't know whether LIBINTL_DEP will be
-# non-empty until configure time.  Ugh!
-size_DEPENDENCIES =      $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-objdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME)
-nm_new_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-ar_DEPENDENCIES =        $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-strings_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-ranlib_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-cxxfilt_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-objcopy_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-srconv_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-sysdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-coffdump_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-dlltool_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-windres_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-windmc_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-readelf_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME)
-elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY)
-dllwrap_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY)
-bfdtest1_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
-bfdtest2_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+# There's no global DEPENDENCIES.  So, we must explicitly list everything.
+size_DEPENDENCIES =      $(LIBIBERTY) $(BFDLIB)
+objdump_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME)
+nm_new_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
+ar_DEPENDENCIES =        $(LIBIBERTY) $(BFDLIB)
+strings_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
+strip_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
+ranlib_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
+cxxfilt_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
+objcopy_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
+srconv_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
+sysdump_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
+coffdump_DEPENDENCIES =  $(LIBIBERTY) $(BFDLIB)
+dlltool_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
+windres_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
+windmc_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
+addr2line_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
+readelf_DEPENDENCIES =   $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME)
+elfedit_DEPENDENCIES =   $(LIBIBERTY)
+dllwrap_DEPENDENCIES =   $(LIBIBERTY)
+bfdtest1_DEPENDENCIES =  $(LIBIBERTY) $(BFDLIB)
+bfdtest2_DEPENDENCIES =  $(LIBIBERTY) $(BFDLIB)
 
 LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
 
diff --git a/gas/Makefile.am b/gas/Makefile.am
index b9b9e18be03..e8c4202d454 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -422,7 +422,7 @@  as_new_SOURCES = $(GAS_CFILES)
 as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
 	$(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB) $(ZSTD_LIBS)
 as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
-	$(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
+	$(extra_objects) $(GASLIBS)
 EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \
 	$(TARGET_CPU_HFILES) $(TARGET_EXTRA_FILES) $(TARG_ENV_CFILES) \
 	$(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) \
diff --git a/gas/Makefile.in b/gas/Makefile.in
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6f7f2af31e5..0429a990b26 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -234,7 +234,6 @@  RDYNAMIC = @RDYNAMIC@
 
 # Where is the INTL library?  Typically in ../intl.
 INTL = @LIBINTL@
-INTL_DEPS = @LIBINTL_DEP@
 INTL_CFLAGS = @INCINTL@
 
 # Where is the ICONV library?  This will be empty if in libc or not available.
@@ -682,7 +681,7 @@  CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \
 	$(GMPLIBS) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \
 	$(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB)
 CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \
-	$(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
+	$(OPCODES) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
 	$(LIBSUPPORT)
 
 DIST = gdb
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 6148ccf9121..05a52f5d554 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -114,7 +114,6 @@  include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
 
 # Where is the INTL library?  Typically in ../intl.
 INTL = @LIBINTL@
-INTL_DEPS = @LIBINTL_DEP@
 INTL_CFLAGS = @INCINTL@
 
 INCSUPPORT = \
@@ -367,7 +366,7 @@  install-html:
 clean-info:
 
 gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
-		$(INTL_DEPS) $(GDBSUPPORT)
+		$(GDBSUPPORT)
 	$(SILENCE) rm -f gdbserver$(EXEEXT)
 	$(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
 		$(CXXFLAGS) \
@@ -376,7 +375,7 @@  gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
 		$(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS) $(MAYBE_LIBICONV)
 
 gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \
-		$(INTL_DEPS) $(GDBSUPPORT)
+		$(GDBSUPPORT)
 	$(SILENCE) rm -f gdbreplay$(EXEEXT)
 	$(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
 		$(CXXFLAGS) \
diff --git a/gold/Makefile.am b/gold/Makefile.am
index ddd6a007438..ef307adcb94 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -185,7 +185,7 @@  libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES)
 libgold_a_LIBADD = $(LIBOBJS)
 
 sources_var = main.cc
-deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
+deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY)
 ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
 	 $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 ldflags_var = $(GOLD_LDFLAGS)
@@ -198,13 +198,12 @@  ld_new_LDFLAGS = $(ldflags_var)
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 
 incremental_dump_SOURCES = incremental-dump.cc
-incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
-	$(LIBINTL_DEP)
+incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY)
 incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
 	 $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 
 dwp_SOURCES = dwp.cc
-dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
+dwp_DEPENDENCIES = libgold.a $(LIBIBERTY)
 dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \
 	$(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 dwp_LDFLAGS = $(GOLD_LDFLAGS)
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 2f1348fd6e2..2fb2a539cb2 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -118,7 +118,7 @@  check_LIBRARIES = libgoldtest.a
 libgoldtest_a_SOURCES = test.cc testmain.cc testfile.cc
 
 DEPENDENCIES = \
-	libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP)
+	libgoldtest.a ../libgold.a ../../libiberty/libiberty.a
 
 # The unittests themselves
 if NATIVE_OR_CROSS_LINKER
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 0b2b59915a9..02c223668cc 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -45,7 +45,7 @@  sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
 	search_list.c symtab.c sym_ids.c utils.c \
 	i386.c alpha.c vax.c sparc.c mips.c aarch64.c
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
-gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP)
+gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a
 gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL)
 
 noinst_HEADERS = \
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 6a9833e5775..d760f134424 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -658,7 +658,7 @@  ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
 	ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c plugin.c \
 	ldbuildid.c
 ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \
-		      $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
+		      $(BFDLIB) $(LIBCTF) $(LIBIBERTY)
 ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
 	       $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 
diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index 4d918e3ef9b..09e2f04f3c5 100644
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -160,8 +160,6 @@  else
   BUILD_LIBS=-liberty
   BUILD_LIB_DEPS=
 fi
-BUILD_LIBS="$BUILD_LIBS $LIBINTL"
-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"
 
 AC_SUBST(BUILD_LIBS)
 AC_SUBST(BUILD_LIB_DEPS)