Skip to content

Commit a51488e

Browse files
committed
fix
1 parent 2416570 commit a51488e

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

.github/workflows/build-cmake.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ jobs:
1414
ANDROID_HOME: /opt/termux/android-sdk
1515
NDK: /opt/termux/android-ndk
1616
CMAKE_VERSION: ${{ github.event.inputs.version }}
17-
TERMUX_BASE_PREFIX: /data/data/com.itsaky.androidide/files
18-
TERMUX_PREFIX: /data/data/com.itsaky.androidide/files/usr
19-
TERMUX_HOME: /data/data/com.itsaky.androidide/files/home
2017
strategy:
2118
matrix:
2219
target_arch:
@@ -37,6 +34,8 @@ jobs:
3734
run: |
3835
sed -i "s/CMAKE_VER/$CMAKE_VERSION/g" cmake-portable/build.sh
3936
cp -r cmake-portable termux-packages/packages
37+
rm termux-packages/packages/ninja/build.sh
38+
cp ninja/build.sh termux-packages/packages/ninja/build.sh
4039
4140
- name: Build cmake-${{ matrix.target_arch }}
4241
working-directory: ./termux-packages
@@ -46,8 +45,6 @@ jobs:
4645
- name: Build ninja-${{ matrix.target_arch }}
4746
working-directory: ./termux-packages
4847
run: |
49-
rm ./packages/ninja/build.sh
50-
cp ninja/build.sh ./packages/ninja/build.sh
5148
./scripts/run-docker.sh ./build-package.sh -a ${{ matrix.target_arch }} -I ninja
5249
5350
- name: Merge CMake and Ninja

cmake-portable/build.sh

+19-14
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,24 @@ TERMUX_PKG_VERSION=CMAKE_VER
77
TERMUX_PKG_REVISION=1
88
TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
99
TERMUX_PKG_SHA256=1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8
10-
TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
11-
TERMUX_PKG_RECOMMENDS="clang, make"
10+
# TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, zlib"
11+
# TERMUX_PKG_RECOMMENDS="clang, make"
1212
TERMUX_PKG_FORCE_CMAKE=true
1313
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
14-
-DSPHINX_MAN=ON
15-
-DCMAKE_MAN_DIR=share/man
16-
-DCMAKE_DOC_DIR=share/doc/cmake
17-
-DCMAKE_USE_SYSTEM_CURL=ON
18-
-DCMAKE_USE_SYSTEM_EXPAT=ON
19-
-DCMAKE_USE_SYSTEM_FORM=ON
20-
-DCMAKE_USE_SYSTEM_JSONCPP=ON
21-
-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
22-
-DCMAKE_USE_SYSTEM_LIBRHASH=ON
23-
-DCMAKE_USE_SYSTEM_LIBUV=ON
24-
-DCMAKE_USE_SYSTEM_ZLIB=ON
25-
-DBUILD_CursesDialog=ON"
14+
# -DSPHINX_MAN=ON
15+
# -DCMAKE_MAN_DIR=share/man
16+
# -DCMAKE_DOC_DIR=share/doc/cmake
17+
# -DCMAKE_USE_SYSTEM_CURL=ON
18+
# -DCMAKE_USE_SYSTEM_EXPAT=ON
19+
# -DCMAKE_USE_SYSTEM_FORM=ON
20+
# -DCMAKE_USE_SYSTEM_JSONCPP=ON
21+
# -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
22+
# -DCMAKE_USE_SYSTEM_LIBRHASH=ON
23+
# -DCMAKE_USE_SYSTEM_LIBUV=ON
24+
# -DCMAKE_USE_SYSTEM_ZLIB=ON
25+
# -DBUILD_CursesDialog=ON"
26+
27+
termux_step_pre_configure() {
28+
CXXFLAGS+=" $CPPFLAGS"
29+
# LDFLAGS+=" -landroid-spawn"
30+
}

0 commit comments

Comments
 (0)