b392df5443
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 566eb38bdf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hesse <mail@eworm.de>
|
|
Date: Wed, 14 Dec 2022 09:04:39 +0100
|
|
Subject: [PATCH] autotools: do not add iconv for Requires.private
|
|
|
|
There is no pkgconfig file for iconv, thus things break with this
|
|
change. Let's drop iconv from Requires.private.
|
|
|
|
Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows")
|
|
Upstream: https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
configure.ac | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 99bff20d1..f245d0c55 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -434,7 +434,6 @@ if test "x$with_iconv" != "xno"; then
|
|
AC_CHECK_HEADERS([localcharset.h])
|
|
am_save_LIBS="$LIBS"
|
|
LIBS="${LIBS} ${LIBICONV}"
|
|
- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
|
|
AC_CHECK_FUNCS([locale_charset])
|
|
LIBS="${am_save_LIBS}"
|
|
if test "x$ac_cv_func_locale_charset" != "xyes"; then
|