diff options
author | Pierre Gajda <gajda.p@live.fr> | 2019-06-28 14:28:27 +0200 |
---|---|---|
committer | Pierre Gajda <gajda.p@live.fr> | 2019-06-28 14:28:27 +0200 |
commit | c9eb2dc70b7babe2a752f04400aa287a97092a61 (patch) | |
tree | 4d970a692a4dceebddc243bb58415f985fda4c51 /reproduce | |
parent | 5761eecf6c9018f204c9b3a4e6b9313d24ae7d16 (diff) |
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
Diffstat (limited to 'reproduce')
-rw-r--r-- | reproduce/software/make/basic.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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)" > $@ |