FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Remove LIBINTL_DEP"

Browse source 
This reverts commit e874cbd387.
The patch was wrong.  LIBINTL_DEP is needed with an in-tree gettext.
This commit is contained in:
Alan Modra 2024-06-20 21:14:24 +09:30
parent e874cbd387
commit 56f3903369
30 changed files with 121 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bfd/Makefile.in
View file

@ -367,6 +367,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@

6
bfd/configure vendored
View file

@ -669,6 +669,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -11154,7 +11155,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11157 "configure"
#line 11158 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11260,7 +11261,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11263 "configure"
#line 11264 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -14550,6 +14551,7 @@ 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

46
binutils/Makefile.am
View file

@ -226,28 +226,30 @@ development.exp: $(BFDDIR)/development.sh
installcheck-local:
/bin/sh $(srcdir)/sanity.sh $(bindir)
# 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)
# 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)
LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)

47
binutils/Makefile.in
View file

@ -528,6 +528,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@ -766,28 +767,30 @@ CC_FOR_TARGET = ` \
fi`
# 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)
# 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)
LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
size_SOURCES = size.c $(BULIBS)
objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)

6
binutils/configure vendored
View file

@ -668,6 +668,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -11080,7 +11081,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11083 "configure"
#line 11084 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11186,7 +11187,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11189 "configure"
#line 11190 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -14614,6 +14615,7 @@ 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

1
config/gettext-sister.m4
View file

@ -28,6 +28,7 @@ m4_popdef([gettext_builddir])
AC_SUBST([USE_NLS])
AC_SUBST([LIBINTL])
AC_SUBST([LIBINTL_DEP])
AC_SUBST([INCINTL])
AC_SUBST([XGETTEXT])
AC_SUBST([GMSGFMT])

2
gas/Makefile.am
View file

@ -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)
$(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \
$(TARGET_CPU_HFILES) $(TARGET_EXTRA_FILES) $(TARG_ENV_CFILES) \
$(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) \

3
gas/Makefile.in
View file

@ -413,6 +413,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -910,7 +911,7 @@ 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)
$(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
# The LoongArch lexical analyzer and parser.

6
gas/configure vendored
View file

@ -653,6 +653,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -10774,7 +10775,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10777 "configure"
#line 10778 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -10880,7 +10881,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10883 "configure"
#line 10884 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15137,6 +15138,7 @@ 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

3
gdb/Makefile.in
View file

@ -234,6 +234,7 @@ 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.
@ -681,7 +682,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) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
$(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
$(LIBSUPPORT)
DIST = gdb

6
gdb/configure vendored
View file

@ -775,6 +775,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -11498,7 +11499,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11501 "configure"
#line 11502 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11604,7 +11605,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11607 "configure"
#line 11608 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -24506,6 +24507,7 @@ 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

5
gdbserver/Makefile.in
View file

@ -114,6 +114,7 @@ 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 = \
@ -366,7 +367,7 @@ install-html:
clean-info:
gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
$(GDBSUPPORT)
$(INTL_DEPS) $(GDBSUPPORT)
$(SILENCE) rm -f gdbserver$(EXEEXT)
$(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
$(CXXFLAGS) \
@ -375,7 +376,7 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
$(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS) $(MAYBE_LIBICONV)
gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \
$(GDBSUPPORT)
$(INTL_DEPS) $(GDBSUPPORT)
$(SILENCE) rm -f gdbreplay$(EXEEXT)
$(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
$(CXXFLAGS) \

1
gdbsupport/Makefile.in
View file

@ -291,6 +291,7 @@ LARGEFILE_CPPFLAGS = @LARGEFILE_CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBIPT = @LIBIPT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@

2
gdbsupport/configure vendored
View file

@ -650,6 +650,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -10357,6 +10358,7 @@ 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

7
gold/Makefile.am
View file

@ -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)
deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
$(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
ldflags_var = $(GOLD_LDFLAGS)
@ -198,12 +198,13 @@ ld_new_LDFLAGS = $(ldflags_var)
EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
incremental_dump_SOURCES = incremental-dump.cc
incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY)
incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
$(LIBINTL_DEP)
incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
$(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
dwp_SOURCES = dwp.cc
dwp_DEPENDENCIES = libgold.a $(LIBIBERTY)
dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \
$(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
dwp_LDFLAGS = $(GOLD_LDFLAGS)

9
gold/Makefile.in
View file

@ -569,6 +569,7 @@ LDFLAGS = @LDFLAGS@
LFS_CFLAGS = @LFS_CFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
@ -826,7 +827,7 @@ ALL_TARGETOBJS = \
libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES)
libgold_a_LIBADD = $(LIBOBJS)
sources_var = main.cc
deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY)
deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
$(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
@ -837,12 +838,14 @@ ld_new_LDADD = $(ldadd_var)
ld_new_LDFLAGS = $(ldflags_var)
EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
incremental_dump_SOURCES = incremental-dump.cc
incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY)
incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
$(LIBINTL_DEP)
incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
$(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
dwp_SOURCES = dwp.cc
dwp_DEPENDENCIES = libgold.a $(LIBIBERTY)
dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \
$(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)

2
gold/configure vendored
View file

@ -698,6 +698,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -8772,6 +8773,7 @@ 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

2
gold/testsuite/Makefile.am
View file

@ -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
libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP)
# The unittests themselves
if NATIVE_OR_CROSS_LINKER

3
gold/testsuite/Makefile.in
View file

@ -2671,6 +2671,7 @@ LDFLAGS = @LDFLAGS@
LFS_CFLAGS = @LFS_CFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
@ -2903,7 +2904,7 @@ TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
check_LIBRARIES = libgoldtest.a
libgoldtest_a_SOURCES = test.cc testmain.cc testfile.cc
DEPENDENCIES = \
libgoldtest.a ../libgold.a ../../libiberty/libiberty.a
libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP)
@NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_SOURCES = object_unittest.cc
@NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_LDFLAGS = $(THREADFLAGS)

2
gprof/Makefile.am
View file

@ -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
gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP)
gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL)
noinst_HEADERS = \

3
gprof/Makefile.in
View file

@ -352,6 +352,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@ -467,7 +468,7 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.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
gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP)
gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL)
noinst_HEADERS = \
basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \

6
gprof/configure vendored
View file

@ -649,6 +649,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -10652,7 +10653,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10655 "configure"
#line 10656 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -10758,7 +10759,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10761 "configure"
#line 10762 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13310,6 +13311,7 @@ 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

2
ld/Makefile.am
View file

@ -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)
$(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
$(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)

3
ld/Makefile.in
View file

@ -425,6 +425,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@ -1035,7 +1036,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
ldbuildid.c
ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \
$(BFDLIB) $(LIBCTF) $(LIBIBERTY)
$(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
$(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)

6
ld/configure vendored
View file

@ -667,6 +667,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -11682,7 +11683,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11685 "configure"
#line 11686 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11788,7 +11789,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11791 "configure"
#line 11792 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -18099,6 +18100,7 @@ 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

1
libctf/Makefile.in
View file

@ -470,6 +470,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@

6
libctf/configure vendored
View file

@ -684,6 +684,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -7401,6 +7402,7 @@ 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
@ -13594,7 +13596,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 13597 "configure"
#line 13599 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13700,7 +13702,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 13703 "configure"
#line 13705 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

1
opcodes/Makefile.in
View file

@ -324,6 +324,7 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBINTL_DEP = @LIBINTL_DEP@
LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@

8
opcodes/configure vendored
View file

@ -656,6 +656,7 @@ INSTOBJEXT
DATADIRNAME
CATALOGS
INCINTL
LIBINTL_DEP
POSUB
LTLIBINTL
LIBINTL
@ -11089,7 +11090,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11092 "configure"
#line 11093 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11195,7 +11196,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11198 "configure"
#line 11199 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13645,6 +13646,7 @@ 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
@ -14344,6 +14346,8 @@ else
BUILD_LIBS=-liberty
BUILD_LIB_DEPS=
fi
BUILD_LIBS="$BUILD_LIBS $LIBINTL"
BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"

2
opcodes/configure.ac
View file

@ -160,6 +160,8 @@ 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)