diff mbox series

[2/2] progs: just use libtoolize

Message ID 20230119233906.2055062-3-david@fromorbit.com (mailing list archive)
State Accepted
Headers show
Series xfsprogs: fix libtoolize issues | expand

Commit Message

Dave Chinner Jan. 19, 2023, 11:39 p.m. UTC 
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(-)

Comments

Carlos Maiolino Jan. 20, 2023, 2:16 p.m. UTC | #1 
On Fri, Jan 20, 2023 at 10:39:06AM +1100, Dave Chinner wrote:
> 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>

Reviewed-by: Carlos Maiolino <cmaiolino@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
>
diff mbox series

Patch

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