diff --git a/app/src/main/cpp/0001-Hide-symbols.patch b/app/src/main/cpp/0001-Hide-symbols.patch deleted file mode 100644 index 3918a7001..000000000 --- a/app/src/main/cpp/0001-Hide-symbols.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2fa97f75b64c05da506968fa9a1711716f2d45a0 Mon Sep 17 00:00:00 2001 -From: FooIbar <118464521+FooIbar@users.noreply.github.com> -Date: Tue, 26 Sep 2023 00:08:03 +0800 -Subject: [PATCH 1/2] Hide symbols - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec97e4c7..4d859341 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2129,10 +2129,10 @@ SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror") - CHECK_C_SOURCE_COMPILES("void __attribute__((visibility(\"default\"))) foo(void); - int main() { return 0; }" HAVE_VISIBILITY_ATTR) --IF (HAVE_VISIBILITY_ATTR) -+IF (0) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") - ADD_DEFINITIONS(-D__LIBARCHIVE_ENABLE_VISIBILITY) --ENDIF(HAVE_VISIBILITY_ATTR) -+ENDIF(0) - SET(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}") - - # Generate "config.h" from "build/cmake/config.h.in" --- -2.34.1 - diff --git a/app/src/main/cpp/0002-Insert-link-libs.patch b/app/src/main/cpp/0001-Insert-link-libs.patch similarity index 79% rename from app/src/main/cpp/0002-Insert-link-libs.patch rename to app/src/main/cpp/0001-Insert-link-libs.patch index c44a8b3e8..84208c43c 100644 --- a/app/src/main/cpp/0002-Insert-link-libs.patch +++ b/app/src/main/cpp/0001-Insert-link-libs.patch @@ -1,14 +1,14 @@ -From 2dcc8be937499022c37678eb6bf4bd026b6fcbb0 Mon Sep 17 00:00:00 2001 +From aee8f7147ddb262fd9e5feee8d5b17094cf3470f Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Tue, 26 Sep 2023 00:09:25 +0800 -Subject: [PATCH 2/2] Insert link libs +Subject: [PATCH] Insert link libs --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4d859341..1cd1cd47 100644 +index ec97e4c7..420f204c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -438,7 +438,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 5faf76586..135926ed4 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -23,7 +23,7 @@ FetchContent_Declare( liblzma GIT_REPOSITORY https://github.com/tukaani-project/xz.git GIT_TAG v5.6.2 - PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binaries.patch || cd . + PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binaries.patch ) FetchContent_MakeAvailable(liblzma) @@ -75,6 +75,7 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1) SET(HAVE_LZMADEC_H 1) SET(HAVE_LIBLZMADEC 1) +option(ENABLE_OPENSSL OFF) option(ENABLE_TAR OFF) option(ENABLE_CPIO OFF) option(ENABLE_CAT OFF) @@ -88,7 +89,7 @@ FetchContent_Declare( libarchive GIT_REPOSITORY https://github.com/libarchive/libarchive.git GIT_TAG v3.7.4 - PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Hide-symbols.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd . + PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Insert-link-libs.patch ) FetchContent_MakeAvailable(libarchive) @@ -106,4 +107,4 @@ corrosion_add_target_local_rustflags(ehviewer_rust "-Clink-args=-Wl,-z,max-page- # Build and link our app's native lib add_library(${PROJECT_NAME} SHARED archive.c border.c gifutils.c hash.c natsort/strnatcmp.c) -target_link_libraries(${PROJECT_NAME} ehviewer_rust archive_static log jnigraphics) +target_link_libraries(${PROJECT_NAME} ehviewer_rust archive_static log jnigraphics -Wl,--exclude-libs,ALL)