Skip to content

Commit 2416570

Browse files
committed
fix
1 parent 5ddd1f3 commit 2416570

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

.github/workflows/build-cmake.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ jobs:
4646
- name: Build ninja-${{ matrix.target_arch }}
4747
working-directory: ./termux-packages
4848
run: |
49-
## sed -i "s/TERMUX_PKG_DEPENDS/TERMUX_PKG_BUILD_DEPENDS/g" ./packages/ninja/build.sh
49+
rm ./packages/ninja/build.sh
50+
cp ninja/build.sh ./packages/ninja/build.sh
5051
./scripts/run-docker.sh ./build-package.sh -a ${{ matrix.target_arch }} -I ninja
5152
5253
- name: Merge CMake and Ninja

ninja/build.sh

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
TERMUX_PKG_HOMEPAGE=https://ninja-build.org
2+
TERMUX_PKG_DESCRIPTION="A small build system with a focus on speed"
3+
TERMUX_PKG_LICENSE="Apache-2.0"
4+
TERMUX_PKG_MAINTAINER="@termux"
5+
TERMUX_PKG_VERSION="1.11.1"
6+
TERMUX_PKG_SRCURL=https://github.com/ninja-build/ninja/archive/v${TERMUX_PKG_VERSION}.tar.gz
7+
TERMUX_PKG_SHA256=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
8+
TERMUX_PKG_AUTO_UPDATE=true
9+
# TERMUX_PKG_DEPENDS="libc++, libandroid-spawn"
10+
11+
termux_step_pre_configure() {
12+
CXXFLAGS+=" $CPPFLAGS"
13+
# LDFLAGS+=" -landroid-spawn"
14+
}
15+
16+
termux_step_configure() {
17+
$TERMUX_PKG_SRCDIR/configure.py
18+
}
19+
20+
termux_step_make() {
21+
if $TERMUX_ON_DEVICE_BUILD; then
22+
$TERMUX_PKG_SRCDIR/configure.py --bootstrap
23+
else
24+
termux_setup_ninja
25+
ninja -j $TERMUX_MAKE_PROCESSES
26+
fi
27+
}
28+
29+
termux_step_make_install() {
30+
cp ninja $TERMUX_PREFIX/bin
31+
}

0 commit comments

Comments
 (0)