deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/libarchive: bump version to 3.7.1 

Removed patch, upstream applied a different solution:
1f35c466aa

Release notes:
https://github.com/libarchive/libarchive/releases/tag/v3.7.1
https://github.com/libarchive/libarchive/releases/tag/v3.7.0

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
next
Bernd Kuhls 2023-08-05 23:34:08 +02:00 committed by Thomas Petazzoni
parent 09c4a7a35f
commit 7991d2c48a
4 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@ -659,7 +659,6 @@ package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch Upstream
package/lftp/0001-Fix-build-with-LibreSSL-following-commit-537f37898.patch Upstream
package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch Upstream
package/libabseil-cpp/0001-force-position-independent-code.patch Upstream
package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch Upstream
package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch Upstream
package/libart/0001-art-config-cross.patch Sob Upstream
package/libatasmart/0001-strpool-cross-flags.patch Upstream

28
package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch
View File

@ -1,28 +0,0 @@
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")
[Retrieved from:
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
@@ -378,7 +378,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

2
package/libarchive/libarchive.hash
View File

@ -1,4 +1,4 @@
# From https://www.libarchive.de/downloads/sha256sums
sha256 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d libarchive-3.6.2.tar.xz
sha256 b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f libarchive-3.7.1.tar.xz
# Locally computed:
sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING

6
package/libarchive/libarchive.mk
View File

@ -4,17 +4,13 @@
#
################################################################################
LIBARCHIVE_VERSION = 3.6.2
LIBARCHIVE_VERSION = 3.7.1
LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz
LIBARCHIVE_SITE = https://www.libarchive.de/downloads
LIBARCHIVE_INSTALL_STAGING = YES
LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0
LIBARCHIVE_LICENSE_FILES = COPYING
LIBARCHIVE_CPE_ID_VENDOR = libarchive
# We're patching configure.ac
LIBARCHIVE_AUTORECONF = YES
# needed for autoreconf
LIBARCHIVE_DEPENDENCIES += host-pkgconf
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
ifeq ($(BR2_STATIC_LIBS),y)