From e17bee8e3158f60b48b908e996024c0a49012712 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 27 Feb 2018 21:34:54 -0500 Subject: [PATCH 1/2] Properly rename argon2 symbols on Win32 builds --- cmake/FindArgon2.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/FindArgon2.cmake b/cmake/FindArgon2.cmake index c0fb53b41..bb2f5811d 100644 --- a/cmake/FindArgon2.cmake +++ b/cmake/FindArgon2.cmake @@ -21,7 +21,9 @@ if (MINGW) message(STATUS "Patching libargon2...\n") execute_process(COMMAND objcopy --redefine-sym argon2_hash=libargon2_argon2_hash + --redefine-sym _argon2_hash=_libargon2_argon2_hash --redefine-sym argon2_error_message=libargon2_argon2_error_message + --redefine-sym _argon2_error_message=_libargon2_argon2_error_message ${ARGON2_SYS_LIBRARIES} ${CMAKE_BINARY_DIR}/libargon2_patched.a WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) find_library(ARGON2_LIBRARIES libargon2_patched.a PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH) From 5a9099393899a88a6eb30527505360e533b3b7ca Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 27 Feb 2018 21:42:57 -0500 Subject: [PATCH 2/2] Force snapcraft builds to be release builds --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index f4b906619..701174182 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -28,6 +28,7 @@ parts: - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=/usr - -DKEEPASSXC_DIST_TYPE=Snap + - -DKEEPASSXC_BUILD_TYPE=Release - -DWITH_TESTS=OFF - -DWITH_XC_ALL=ON build-packages: