summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2021-03-07 17:58:58 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2021-03-07 18:30:08 -0800
commit5227d66b3c4f7035d4ac69f613b62d68345cb362 (patch)
tree230002c8c1306640e4869129f57f1d60e6bb8b90
parentf51461d8be7ae89388dd0ffd8c9be4572e81bbc6 (diff)
downloadtar-5227d66b3c4f7035d4ac69f613b62d68345cb362.tar.gz
Port linking to AIX 7.1
* src/Makefile.am (LDADD): Remove, folding into tar_LDADD. * src/Makefile.am (tar_LDADD), tests/Makefile.am (LDADD): Add the libraries gnulib-tool currently recommends: LIB_ACL, LIB_CLOCK_GETTIME, LIB_GETRANDOM, LIB_HARD_LOCALE, LIB_HAS_ACL, LIB_MBRTOWC, LIB_SETLOCALE_NULL. Otherwise, tar won’t link on AIX 7.1 with xlc because the -lpthread option is missing.
-rw-r--r--src/Makefile.am7
-rw-r--r--tests/Makefile.am5
2 files changed, 8 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 88ea589a..36803116 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,6 +49,7 @@ tar_SOURCES = \
AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV)
-
-tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX)
+tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\
+ $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
+ $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(LIB_HAS_ACL) $(LIB_MBRTOWC)\
+ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2ee589c2..d9d6b005 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -327,4 +327,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib\
-DLOCALEDIR=\"$(localedir)\"
-LDADD = ../gnu/libgnu.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)
+LDADD = ../gnu/libgnu.a\
+ $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
+ $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(LIB_HAS_ACL) $(LIB_MBRTOWC)\
+ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL)