From a44c029775f512d8b92cabed7585b74d002435be Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sun, 7 Apr 2019 16:18:51 +0100
Subject: GNU M4 now built as a dependency of GNU Libtool

On some systems, M4 isn't available, so the linking to the host system
fails, as a result, we can't build GNU Libtool.

The main reason we weren't building M4 was a bug with the most recent GNU C
library
(http://lists.gnu.org/archive/html/bug-gnulib/2019-04/msg00004.html). But I
found a patch used by Arch Linux which fixes the issue and allows M4 to be
built. As a result, the pipeline is now building M4 also and the patched M4
tarball is now uploaded to my own webpage as backup.

While doing the steps above, I also noticed that we weren't using a tab at
the start of the link definitions of `dependencies-basic.mk'. Although its
not necessary, to be consistent, its good for the lines to always start
with a tab.
---
 reproduce/src/make/dependencies.mk | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'reproduce/src/make/dependencies.mk')

diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk
index 9b46798..d5e8411 100644
--- a/reproduce/src/make/dependencies.mk
+++ b/reproduce/src/make/dependencies.mk
@@ -126,7 +126,6 @@ tarballs = $(foreach t, cfitsio-$(cfitsio-version).tar.gz                  \
                         lapack-$(lapack-version).tar.gz                    \
                         libbsd-$(libbsd-version).tar.xz                    \
                         libpng-$(libpng-version).tar.xz                    \
-                        libtool-$(libtool-version).tar.xz                  \
                         libgit2-$(libgit2-version).tar.gz                  \
                         metastore-$(metastore-version).tar.gz              \
                         openmpi-$(openmpi-version).tar.gz                  \
@@ -176,7 +175,6 @@ $(tarballs): $(tdir)/%: | $(lockdir)
 	  elif [ $$n = lapack      ]; then w=http://www.netlib.org/lapack
 	  elif [ $$n = libbsd      ]; then w=http://libbsd.freedesktop.org/releases
 	  elif [ $$n = libpng      ]; then w=https://download.sourceforge.net/libpng
-	  elif [ $$n = libtool     ]; then w=http://ftp.gnu.org/gnu/libtool
 	  elif [ $$n = libgit      ]; then
 	    mergenames=0
 	    w=https://github.com/libgit2/libgit2/archive/v$(libgit2-version).tar.gz
@@ -515,13 +513,6 @@ $(ibidir)/curl: $(tdir)/curl-$(curl-version).tar.gz
 	               --without-nss, V=1)               \
 	&& echo "cURL $(curl-version)" > $@
 
-# On Mac OS, libtool does different things, so to avoid confusion, we'll
-# prefix GNU's libtool executables with `glibtool'.
-$(ibidir)/glibtool: $(tdir)/libtool-$(libtool-version).tar.xz
-	$(call gbuild, $<, libtool-$(libtool-version), static, \
-                       --program-prefix=g)                     \
-	&& echo "GNU Libtool $(libtool-version)" > $@
-
 $(ibidir)/ghostscript: $(tdir)/ghostscript-$(ghostscript-version).tar.gz
 	$(call gbuild, $<, ghostscript-$(ghostscript-version)) \
 	&& echo "GPL Ghostscript $(ghostscript-version)" > $@
@@ -609,7 +600,6 @@ $(ibidir)/gnuastro: $(tdir)/gnuastro-$(gnuastro-version).tar.lz \
                     $(ilidir)/libjpeg  \
                     $(ilidir)/libtiff  \
                     $(ilidir)/libgit2  \
-                    $(ibidir)/glibtool \
                     $(ibidir)/ghostscript
 ifeq ($(static_build),yes)
 	staticopts="--enable-static=yes --enable-shared=no";
-- 
cgit v1.2.1