From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7B4F158095 for ; Sun, 28 Aug 2022 12:26:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E470E08F7; Sun, 28 Aug 2022 12:26:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E605BE08CD for ; Sun, 28 Aug 2022 12:26:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1792340DDE for ; Sun, 28 Aug 2022 12:26:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EBCF588 for ; Sun, 28 Aug 2022 12:26:20 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1661687466.1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: tests/rmspace/, /, tests/mkdir/, tests/atom_explode/, libq/, tests/copy_file/ X-VCS-Repository: proj/portage-utils X-VCS-Files: Makefile.am configure.ac libq/Makefile.am tests/atom_explode/Makefile.am tests/copy_file/Makefile.am tests/mkdir/Makefile.am tests/rmspace/Makefile.am X-VCS-Directories: tests/copy_file/ libq/ tests/mkdir/ tests/atom_explode/ / tests/rmspace/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d X-VCS-Branch: master Date: Sun, 28 Aug 2022 12:26:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9060f7db-840e-4725-9065-50ee3e94b899 X-Archives-Hash: 90c3ceb94b4d29178c5d776a9171c66e commit: 1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d Author: David Seifert gentoo org> AuthorDate: Sun Aug 28 11:40:31 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Aug 28 11:51:06 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1ad6040d Remove libtool * Libtool was only used for convenience libraries, which can be done in vanilla Automake. This allows passing `static` in LDFLAGS. Bug: https://bugs.gentoo.org/841898 Signed-off-by: David Seifert gentoo.org> Signed-off-by: Fabian Groffen gentoo.org> Makefile.am | 2 +- configure.ac | 3 +-- libq/Makefile.am | 6 +++--- tests/atom_explode/Makefile.am | 2 +- tests/copy_file/Makefile.am | 2 +- tests/mkdir/Makefile.am | 2 +- tests/rmspace/Makefile.am | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 13a6044..7dbcf42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,7 +78,7 @@ q_CPPFLAGS = \ $(LIBZ_CFLAGS) \ $(NULL) q_LDADD = \ - $(top_builddir)/libq/libq.la \ + $(top_builddir)/libq/libq.a \ $(top_builddir)/autotools/gnulib/libgnu.a \ $(OPENMP_CFLAGS) \ $(LIBSSL_LIBS) \ diff --git a/configure.ac b/configure.ac index 5378795..9f892c6 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,7 @@ gl_EARLY gl_INIT AM_PROG_AR -LT_INIT -AC_SUBST([LIBTOOL_DEPS]) +AC_PROG_LN_S headers='#ifdef HAVE_STDDEF_H #include diff --git a/libq/Makefile.am b/libq/Makefile.am index c0402a4..879d4a7 100644 --- a/libq/Makefile.am +++ b/libq/Makefile.am @@ -34,9 +34,9 @@ QFILES += hash_md5_sha1.c hash_md5_sha1.h endif endif -noinst_LTLIBRARIES = libq.la -libq_la_SOURCES = $(QFILES) -libq_la_CPPFLAGS = \ +noinst_LIBRARIES = libq.a +libq_a_SOURCES = $(QFILES) +libq_a_CPPFLAGS = \ $(OPENMP_CFLAGS) \ -I$(top_builddir)/autotools/gnulib \ -I$(top_srcdir)/autotools/gnulib diff --git a/tests/atom_explode/Makefile.am b/tests/atom_explode/Makefile.am index ecdcc58..03f5754 100644 --- a/tests/atom_explode/Makefile.am +++ b/tests/atom_explode/Makefile.am @@ -7,7 +7,7 @@ e_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/libq \ -I$(top_builddir)/autotools/gnulib \ -I$(top_srcdir)/autotools/gnulib -e_LDADD = $(top_builddir)/libq/libq.la \ +e_LDADD = $(top_builddir)/libq/libq.a \ $(top_builddir)/autotools/gnulib/libgnu.a \ $(LIB_CLOCK_GETTIME) \ $(LIB_EACCESS) diff --git a/tests/copy_file/Makefile.am b/tests/copy_file/Makefile.am index 5fbdf15..41bbc72 100644 --- a/tests/copy_file/Makefile.am +++ b/tests/copy_file/Makefile.am @@ -7,7 +7,7 @@ m_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/libq \ -I$(top_builddir)/autotools/gnulib \ -I$(top_srcdir)/autotools/gnulib -m_LDADD = $(top_builddir)/libq/libq.la \ +m_LDADD = $(top_builddir)/libq/libq.a \ $(top_builddir)/autotools/gnulib/libgnu.a \ $(LIB_CLOCK_GETTIME) \ $(LIB_EACCESS) \ diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am index e9d1536..4b17004 100644 --- a/tests/mkdir/Makefile.am +++ b/tests/mkdir/Makefile.am @@ -7,7 +7,7 @@ m_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/libq \ -I$(top_builddir)/autotools/gnulib \ -I$(top_srcdir)/autotools/gnulib -m_LDADD = $(top_builddir)/libq/libq.la \ +m_LDADD = $(top_builddir)/libq/libq.a \ $(top_builddir)/autotools/gnulib/libgnu.a \ $(LIB_CLOCK_GETTIME) \ $(LIB_EACCESS) diff --git a/tests/rmspace/Makefile.am b/tests/rmspace/Makefile.am index cb54f32..0cb689d 100644 --- a/tests/rmspace/Makefile.am +++ b/tests/rmspace/Makefile.am @@ -7,7 +7,7 @@ m_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/libq \ -I$(top_builddir)/autotools/gnulib \ -I$(top_srcdir)/autotools/gnulib -m_LDADD = $(top_builddir)/libq/libq.la \ +m_LDADD = $(top_builddir)/libq/libq.a \ $(top_builddir)/autotools/gnulib/libgnu.a \ $(LIB_CLOCK_GETTIME) \ $(LIB_EACCESS)