diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk index ea25b94429..9d4bb6f7d6 100644 --- a/packages/compress/libarchive/package.mk +++ b/packages/compress/libarchive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libarchive" -PKG_VERSION="3.3.2" -PKG_SHA256="ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce" +PKG_VERSION="3.3.3" +PKG_SHA256="ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e" PKG_LICENSE="GPL" PKG_SITE="https://www.libarchive.org" PKG_URL="https://www.libarchive.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz" @@ -11,8 +11,11 @@ PKG_DEPENDS_HOST="toolchain" PKG_DEPENDS_TARGET="toolchain" PKG_SHORTDESC="A multi-format archive and compression library." -PKG_CMAKE_OPTS_TARGET="-DENABLE_SHARED=0 -DENABLE_STATIC=1 -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DENABLE_EXPAT=0 -DENABLE_ICONV=0 -DENABLE_LIBXML2=0 -DENABLE_LZO=1 -DENABLE_TEST=0 -DENABLE_COVERAGE=0" +PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 -DENABLE_EXPAT=0 -DENABLE_ICONV=0 -DENABLE_LIBXML2=0 -DENABLE_LZO=1 -DENABLE_TEST=0 -DENABLE_COVERAGE=0" post_makeinstall_target() { rm -rf $INSTALL + + # delete the shared library as we only want static + rm $SYSROOT_PREFIX/usr/lib/libarchive.so* } diff --git a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch b/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch index 9a831f2a2e..d3410e234f 100644 --- a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch +++ b/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch @@ -1,11 +1,14 @@ -From f3c2f0ca7916288c72da07a2c3352b85b8f96e55 Mon Sep 17 00:00:00 2001 +From cd88d92aa23f6f32aedd54f9a83c118ede4ee799 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Sat, 11 Nov 2017 23:42:40 +0100 Subject: [PATCH] die Werror +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73bf07b..08e8f49 100644 +index 80871bc..9bd5165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") @@ -26,7 +29,7 @@ index 73bf07b..08e8f49 100644 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow") -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use") ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$") @@ -35,3 +38,15 @@ index 73bf07b..08e8f49 100644 ################################################################# # Set compile flags for debug build. # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" +@@ -172,7 +172,7 @@ IF (MSVC) + ################################################################# + # Set compile flags for release build. + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Oi") +-ENDIF (MSVC) ++ENDIF (0) + + # Enable CTest/CDash support + include(CTest) +-- +2.7.4 + diff --git a/packages/compress/libarchive/patches/libarchive-02-static-please.patch b/packages/compress/libarchive/patches/libarchive-02-static-please.patch deleted file mode 100644 index fb2bbc275a..0000000000 --- a/packages/compress/libarchive/patches/libarchive-02-static-please.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libarchive/libarchive/CMakeLists.txt -+++ libarchive/libarchive/CMakeLists.txt -@@ -224,9 +224,9 @@ - ENDIF() - - # Libarchive is a shared library --ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) -+ADD_LIBRARY(archive STATIC ${libarchive_SOURCES} ${include_HEADERS}) - TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) --SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) -+SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS LIBARCHIVE_STATIC) - - # archive_static is a static library - ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})