From c9eb2dc70b7babe2a752f04400aa287a97092a61 Mon Sep 17 00:00:00 2001 From: Pierre Gajda Date: Fri, 28 Jun 2019 14:28:27 +0200 Subject: Fixed a conflict with libiconv and pkg-config Libiconv has to be installed before pkg-config otherwise there would be a compilation error: gconvert.c:61:2: error: #error GNU libiconv not in use but included iconv.h is from libiconv 61 | #error GNU libiconv not in use but included iconv.h is from libiconv --- reproduce/software/make/basic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'reproduce/software') diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 9628140..e22879b 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -837,7 +837,7 @@ $(ibidir)/gawk: $(tdir)/gawk-$(gawk-version).tar.lz \ && echo "GNU AWK $(gawk-version)" > $@ $(ibidir)/libiconv: $(tdir)/libiconv-$(libiconv-version).tar.gz \ - $(ibidir)/coreutils + $(ibidir)/pkg-config $(call gbuild, $<, libiconv-$(libiconv-version), static) \ && echo "GNU libiconv $(libiconv-version)" > $@ -- cgit v1.2.1