From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 2/2] progs: just use libtoolize
Date: Fri, 20 Jan 2023 10:39:06 +1100 [thread overview]
Message-ID: <20230119233906.2055062-3-david@fromorbit.com> (raw)
In-Reply-To: <20230119233906.2055062-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
We no longer support xfsprogs on random platforms other than Linux,
so drop the complexity in detecting the libtoolize binary on MacOS
from the main makefile.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
Makefile | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index c8455a9e665f..c12df98dbef3 100644
--- a/Makefile
+++ b/Makefile
@@ -73,14 +73,6 @@ ifneq ("$(XGETTEXT)","")
TOOL_SUBDIRS += po
endif
-# If we are on OS X, use glibtoolize from MacPorts, as OS X doesn't have
-# libtoolize binary itself.
-LIBTOOLIZE_TEST=$(shell libtoolize --version >/dev/null 2>&1 && echo found)
-LIBTOOLIZE_BIN=libtoolize
-ifneq ("$(LIBTOOLIZE_TEST)","found")
-LIBTOOLIZE_BIN=glibtoolize
-endif
-
# include is listed last so it is processed last in clean rules.
SUBDIRS = $(LIBFROG_SUBDIR) $(LIB_SUBDIRS) $(TOOL_SUBDIRS) include
@@ -116,7 +108,7 @@ clean: # if configure hasn't run, nothing to clean
endif
configure: configure.ac
- $(LIBTOOLIZE_BIN) -c -i -f
+ libtoolize -c -i -f
cp include/install-sh .
aclocal -I m4
autoconf
--
2.39.0
next prev parent reply other threads:[~2023-01-19 23:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 23:39 [PATCH 0/2] xfsprogs: fix libtoolize issues Dave Chinner
2023-01-19 23:39 ` [PATCH 1/2] progs: autoconf fails during debian package builds Dave Chinner
2023-01-20 14:15 ` Carlos Maiolino
2023-01-19 23:39 ` Dave Chinner [this message]
2023-01-20 14:16 ` [PATCH 2/2] progs: just use libtoolize Carlos Maiolino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119233906.2055062-3-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox