fix

MrIkso · Jan 17, 2023 · a51488e · a51488e
1 parent 2416570
commit a51488e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
@@ -14,9 +14,6 @@ jobs:
       ANDROID_HOME: /opt/termux/android-sdk
       NDK: /opt/termux/android-ndk
       CMAKE_VERSION: ${{ github.event.inputs.version }}
-      TERMUX_BASE_PREFIX: /data/data/com.itsaky.androidide/files
-      TERMUX_PREFIX: /data/data/com.itsaky.androidide/files/usr
-      TERMUX_HOME: /data/data/com.itsaky.androidide/files/home
     strategy:
       matrix:
         target_arch:
@@ -37,6 +34,8 @@ jobs:
         run: |
           sed -i "s/CMAKE_VER/$CMAKE_VERSION/g" cmake-portable/build.sh
           cp -r cmake-portable termux-packages/packages
+          rm termux-packages/packages/ninja/build.sh
+          cp ninja/build.sh termux-packages/packages/ninja/build.sh
 
       - name: Build cmake-${{ matrix.target_arch }}
         working-directory: ./termux-packages
@@ -46,8 +45,6 @@ jobs:
       - name: Build ninja-${{ matrix.target_arch }}
         working-directory: ./termux-packages
         run: |
-          rm ./packages/ninja/build.sh
-          cp ninja/build.sh ./packages/ninja/build.sh
           ./scripts/run-docker.sh ./build-package.sh -a ${{ matrix.target_arch }} -I ninja
      
       - name: Merge CMake and Ninja

diff --git a/cmake-portable/build.sh b/cmake-portable/build.sh
@@ -7,19 +7,24 @@ TERMUX_PKG_VERSION=CMAKE_VER
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8
-TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
-TERMUX_PKG_RECOMMENDS="clang, make"
+# TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
+# TERMUX_PKG_RECOMMENDS="clang, make"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DSPHINX_MAN=ON
--DCMAKE_MAN_DIR=share/man
--DCMAKE_DOC_DIR=share/doc/cmake
--DCMAKE_USE_SYSTEM_CURL=ON
--DCMAKE_USE_SYSTEM_EXPAT=ON
--DCMAKE_USE_SYSTEM_FORM=ON
--DCMAKE_USE_SYSTEM_JSONCPP=ON
--DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
--DCMAKE_USE_SYSTEM_LIBRHASH=ON
--DCMAKE_USE_SYSTEM_LIBUV=ON
--DCMAKE_USE_SYSTEM_ZLIB=ON
--DBUILD_CursesDialog=ON"
+# -DSPHINX_MAN=ON
+# -DCMAKE_MAN_DIR=share/man
+# -DCMAKE_DOC_DIR=share/doc/cmake
+# -DCMAKE_USE_SYSTEM_CURL=ON
+# -DCMAKE_USE_SYSTEM_EXPAT=ON
+# -DCMAKE_USE_SYSTEM_FORM=ON
+# -DCMAKE_USE_SYSTEM_JSONCPP=ON
+# -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
+# -DCMAKE_USE_SYSTEM_LIBRHASH=ON
+# -DCMAKE_USE_SYSTEM_LIBUV=ON
+# -DCMAKE_USE_SYSTEM_ZLIB=ON
+# -DBUILD_CursesDialog=ON"
+
+termux_step_pre_configure() {
+	CXXFLAGS+=" $CPPFLAGS"
+	# LDFLAGS+=" -landroid-spawn"
+}