From 73cd532901865fe0b3a53c3e526ab5f7bd7d3122 Mon Sep 17 00:00:00 2001 From: Prasenjit Saha Date: Fri, 28 Jun 2019 11:15:48 +0200 Subject: Corrections to basic build Several corrections were necessary in the basic build: 1) the version of GCC on some systems includes an `_' which would cause a crash when building the PDF. 2) libcharset had to be manually added to the Git build. --- reproduce/software/make/basic.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'reproduce/software/make') diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 9628140..81e8512 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -844,8 +844,9 @@ $(ibidir)/libiconv: $(tdir)/libiconv-$(libiconv-version).tar.gz \ $(ibidir)/git: $(tdir)/git-$(git-version).tar.xz \ $(ibidir)/libiconv \ $(ibidir)/curl # Coreutils, so Git is built after it. + export LDFLAGS=-lcharset; \ $(call gbuild, $<, git-$(git-version), static, \ - --without-tcltk --with-shell=$(ibdir)/bash \ + --without-tcltk --with-shell=$(ibdir)/bash \ --with-iconv=$(idir), V=1) \ && echo "Git $(git-version)" > $@ -- cgit v1.2.1