aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-07-04 18:36:28 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-07-04 18:36:28 +0100
commit1e4065aef1f2a99a1c31a9b5628b85f059c4b71c (patch)
tree93db4533147975a209392ca8ed8afb1a5796dc73
parente1f7fe2114739480a48fe12c39b23acf6fc86771 (diff)
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.
-rw-r--r--.file-metadatabin6236 -> 6236 bytes
-rw-r--r--reproduce/software/make/basic.mk4
2 files changed, 4 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata
index c73ffa1..d16b7ed 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files 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 \