From 6d42e2c69837a757934a41dc39c43d92a8bcd20e Mon Sep 17 00:00:00 2001 From: Rocka Date: Sat, 16 Aug 2025 22:43:24 +0800 Subject: [PATCH 1/4] Try boost 1.89.0 --- build.cfg | 4 ++-- src/Rules/Boost.hs | 33 ++++----------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/build.cfg b/build.cfg index e712285a..045235e3 100644 --- a/build.cfg +++ b/build.cfg @@ -32,8 +32,8 @@ py_table_sha256 = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c ## https://github.com/boostorg/boost/releases boost--cmake.tar.xz # boost -boost_version = 1.87.0 -boost_sha256 = 7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5 +boost_version = 1.89.0 +boost_sha256 = 67acec02d0d118b5de9eb441f5fb707b3a1cdd884be00ca24b9a73c995511f74 ## https://github.com/fcitx/libime-jyutping/blob/master/data/CMakeLists.txt # jyutping dict diff --git a/src/Rules/Boost.hs b/src/Rules/Boost.hs index 0f108a98..18bf9382 100644 --- a/src/Rules/Boost.hs +++ b/src/Rules/Boost.hs @@ -32,37 +32,12 @@ boostRule = do cmakeFlags = const [ "-DCMAKE_INSTALL_MESSAGE=NEVER", - "-DBOOST_EXCLUDE_LIBRARIES=" + "-DBOOST_ENABLE_COMPATIBILITY_TARGETS=ON", + "-DBOOST_INCLUDE_LIBRARIES=" <> intercalate ";" - [ "atomic", - "asio", - "charconv", - "chrono", - "cobalt", - "context", - "contract", - "coroutine", - "date_time", - "fiber", - "filesystem", - "graph", - "json", - "locale", - "log", - "math", - "nowide", - "process", - "program_options", - "serialization", - "stacktrace", - "test", - "thread", - "timer", - "type_erasure", - "url", - "wave", - "wserialization" + [ "headers", + "iostreams" ], "-DBOOST_IOSTREAMS_ENABLE_BZIP2=OFF", "-DBOOST_IOSTREAMS_ENABLE_ZLIB=OFF", From f768677a12d94baad56574623dd36bee39758a29 Mon Sep 17 00:00:00 2001 From: Rocka Date: Sun, 17 Aug 2025 02:14:26 +0800 Subject: [PATCH 2/4] revert to exclude --- src/Rules/Boost.hs | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/Rules/Boost.hs b/src/Rules/Boost.hs index 18bf9382..5443be1b 100644 --- a/src/Rules/Boost.hs +++ b/src/Rules/Boost.hs @@ -32,12 +32,38 @@ boostRule = do cmakeFlags = const [ "-DCMAKE_INSTALL_MESSAGE=NEVER", - "-DBOOST_ENABLE_COMPATIBILITY_TARGETS=ON", - "-DBOOST_INCLUDE_LIBRARIES=" + "-DBOOST_EXCLUDE_LIBRARIES=" <> intercalate ";" - [ "headers", - "iostreams" + [ "atomic", + "asio", + "charconv", + "chrono", + "cobalt", + "container", + "context", + "contract", + "coroutine", + "date_time", + "fiber", + "filesystem", + "graph", + "json", + "locale", + "log", + "math", + "nowide", + "process", + "program_options", + "serialization", + "stacktrace", + "test", + "thread", + "timer", + "type_erasure", + "url", + "wave", + "wserialization" ], "-DBOOST_IOSTREAMS_ENABLE_BZIP2=OFF", "-DBOOST_IOSTREAMS_ENABLE_ZLIB=OFF", From 2f2edb758afdf1548dec7369202a3fe98e11b3c3 Mon Sep 17 00:00:00 2001 From: Rocka Date: Sun, 17 Aug 2025 02:15:27 +0800 Subject: [PATCH 3/4] try CMAKE_MAKE_PROGRAM --- src/Base.hs | 2 +- src/CMakeBuilder.hs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Base.hs b/src/Base.hs index 19a2409e..d4a8e2bc 100644 --- a/src/Base.hs +++ b/src/Base.hs @@ -119,7 +119,7 @@ getSdkCMake :: AndroidEnv -> FilePath getSdkCMake AndroidEnv {..} = sdkRoot "cmake" sdkCMakeVersion "bin" "cmake" getSdkNinja :: AndroidEnv -> FilePath -getSdkNinja AndroidEnv {..} = sdkRoot "cmake" sdkCMakeVersion "bin" +getSdkNinja AndroidEnv {..} = sdkRoot "cmake" sdkCMakeVersion "bin" "ninja" getABIList :: AndroidEnv -> [String] getABIList AndroidEnv {..} = split (== ',') abi diff --git a/src/CMakeBuilder.hs b/src/CMakeBuilder.hs index c697e9f2..cbfbc256 100644 --- a/src/CMakeBuilder.hs +++ b/src/CMakeBuilder.hs @@ -113,13 +113,14 @@ useCMake CmakeBuilder {..} = addOracle $ \(WithAndroidEnv q env) -> do let cmakeEnvOptions = [AddEnv k v | (k, v) <- cmakeEnv bEnv] cmd_ (Cwd src) - (AddPath [] [ninja]) cmakeEnvOptions cmake "-B" buildEnvBuildDir - "-GNinja" + "-G" + "Ninja" ( [ "-DCMAKE_TOOLCHAIN_FILE=" <> toolchain, + "-DCMAKE_MAKE_PROGRAM=" <> ninja, "-DANDROID_ABI=" <> a, "-DANDROID_PLATFORM=" <> show (platform env), "-DANDROID_STL=c++_shared", From 098d9814392abab12c2ec5ab2e7383b37c1d7d72 Mon Sep 17 00:00:00 2001 From: Rocka Date: Sun, 17 Aug 2025 02:26:33 +0800 Subject: [PATCH 4/4] fixup --- src/Rules/Boost.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Rules/Boost.hs b/src/Rules/Boost.hs index 5443be1b..0f108a98 100644 --- a/src/Rules/Boost.hs +++ b/src/Rules/Boost.hs @@ -40,7 +40,6 @@ boostRule = do "charconv", "chrono", "cobalt", - "container", "context", "contract", "coroutine",