| 123456789101112131415161718192021222324252627 |
- 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
- @@ -455,7 +455,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
|
