From 163008fb2ba37e0ce805fd1569dc1022cb77a71d Mon Sep 17 00:00:00 2001 From: Rocka Date: Thu, 23 Feb 2023 20:19:57 +0800 Subject: [PATCH] Update libevent build script --- scripts/build-fmt.sh | 2 +- scripts/build-libevent.sh | 7 +++++-- scripts/build-lua.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/build-fmt.sh b/scripts/build-fmt.sh index 9685bd6c..0bcc5a0f 100755 --- a/scripts/build-fmt.sh +++ b/scripts/build-fmt.sh @@ -6,7 +6,7 @@ NINJA="" build_fmt() { local BUILD_ABI="$1" local BUILD_DIR="./build_$BUILD_ABI" - local INSTALL_DIR="./out/opencc/$BUILD_ABI" + local INSTALL_DIR="./out/fmt/$BUILD_ABI" if [ -e "$BUILD_DIR" ]; then echo ">>> Cleaning previous build intermediates" rm -r "$BUILD_DIR" diff --git a/scripts/build-libevent.sh b/scripts/build-libevent.sh index 9542c96e..a7553165 100755 --- a/scripts/build-libevent.sh +++ b/scripts/build-libevent.sh @@ -6,7 +6,7 @@ NINJA="" build_libevent() { local BUILD_ABI="$1" local BUILD_DIR="./build_$BUILD_ABI" - local INSTALL_DIR="./out/opencc/$BUILD_ABI" + local INSTALL_DIR="./out/libevent/$BUILD_ABI" if [ -e "$BUILD_DIR" ]; then echo ">>> Cleaning previous build intermediates" rm -r "$BUILD_DIR" @@ -16,10 +16,13 @@ build_libevent() { sed -i '1456s|${CMAKE_INSTALL_PREFIX}/||' CMakeLists.txt sed -i '1475{\|"${PROJECT_SOURCE_DIR}/include"|d}' CMakeLists.txt sed -i '1475s|${PROJECT_BINARY_DIR}/||' CMakeLists.txt + # fix LibeventConfig.cmake find_{path,library} calls in ndk toolchain + sed -i '120s|NO_DEFAULT_PATH)|NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)|' cmake/LibeventConfig.cmake.in + sed -i '134s|NO_DEFAULT_PATH)|NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)|' cmake/LibeventConfig.cmake.in "$CMAKE" -B "$BUILD_DIR" -G Ninja \ -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake" \ -DCMAKE_MAKE_PROGRAM="$NINJA" \ - -DANDROID_ABI="$INSTALL_DIR" \ + -DANDROID_ABI="$BUILD_ABI" \ -DANDROID_PLATFORM="$ANDROID_PLATFORM" \ -DANDROID_STL=c++_shared \ -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \ diff --git a/scripts/build-lua.sh b/scripts/build-lua.sh index ad27f7c3..e4e42b66 100755 --- a/scripts/build-lua.sh +++ b/scripts/build-lua.sh @@ -6,7 +6,7 @@ NINJA="" build_lua() { local BUILD_ABI="$1" local BUILD_DIR="./build_$BUILD_ABI" - local INSTALL_DIR="./out/opencc/$BUILD_ABI" + local INSTALL_DIR="./out/lua/$BUILD_ABI" if [ -e "$BUILD_DIR" ]; then echo ">>> Cleaning previous build intermediates" rm -r "$BUILD_DIR"