From 1e4065aef1f2a99a1c31a9b5628b85f059c4b71c Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Thu, 4 Jul 2019 18:36:28 +0100 Subject: Configuring wget without libiconv On some Fedora systems, Wget's build conflicts with libiconv. With this commit, we use Wget's `--without-libiconv-prefix' configure option so it will be built without an outside libiconv. --- .file-metadata | Bin 6236 -> 6236 bytes reproduce/software/make/basic.mk | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/.file-metadata b/.file-metadata index c73ffa1..d16b7ed 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 0258014..1c97910 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -770,11 +770,15 @@ $(ibidir)/wget: $(tdir)/wget-$(wget-version).tar.lz \ $(ibidir)/pkg-config \ $(ibidir)/coreutils \ $(ibidir)/openssl # Coreutils only so Wget is built after it. + + # We need to explicitly disable `libiconv', because of the + # `pkg-config' and `libiconv' problem. libs="-pthread"; \ if [ x$(needs_ldl) = xyes ]; then libs="$$libs -ldl"; fi; \ $(call gbuild, $<, wget-$(wget-version), , \ LIBS="$$LIBS $$libs" \ --with-libssl-prefix=$(idir) \ + --without-libiconv-prefix \ --with-ssl=openssl \ --with-openssl=yes \ --without-metalink \ -- cgit v1.2.1