From 4d27b8efbd2ad1be3d5546d76d24cc21e17eb736 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 22 Nov 2021 07:09:18 +0530 Subject: [PATCH] gn: Bump to latest 20211116 --- CODEOWNERS | 3 +++ packages/gn/build.sh | 8 ++++---- scripts/build/setup/termux_setup_gn.sh | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 6ad9eba855..31d12bc382 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -10,6 +10,9 @@ /clean.sh @Grimler91 @xeffyr /scripts/ @Grimler91 @xeffyr +# GN setup script +/scripts/build/setup/termux_setup_gn.sh @thunder-coding + # Repository utilities. /scripts/bin/ @xeffyr diff --git a/packages/gn/build.sh b/packages/gn/build.sh index e23ba3d9f1..bdc8ae47dd 100755 --- a/packages/gn/build.sh +++ b/packages/gn/build.sh @@ -4,8 +4,8 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Yaksh Bariya " # While updating commit hash here also update it in # termux_setup_gn -_COMMIT=de86ec4176235871a7cb335756987e41246dae4a -TERMUX_PKG_VERSION=20210913 +_COMMIT=4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e +TERMUX_PKG_VERSION=20211116 TERMUX_PKG_RECOMMENDS="ninja" TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_BUILD_IN_SRC=true @@ -34,8 +34,8 @@ termux_step_configure() { cat <<- EOF > ./out/last_commit_position.h #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${TERMUX_PKG_VERSION} - #define LAST_COMMIT_POSITION "${TERMUX_PKG_VERSION}" + #define LAST_COMMIT_POSITION_NUM 1945 + #define LAST_COMMIT_POSITION "1945 ${_COMMIT:0:8}" #endif // OUT_LAST_COMMIT_POSITION_H_ EOF } diff --git a/scripts/build/setup/termux_setup_gn.sh b/scripts/build/setup/termux_setup_gn.sh index 9881948ee6..2be4f8506b 100644 --- a/scripts/build/setup/termux_setup_gn.sh +++ b/scripts/build/setup/termux_setup_gn.sh @@ -1,6 +1,6 @@ termux_setup_gn() { termux_setup_ninja - local GN_COMMIT=de86ec4176235871a7cb335756987e41246dae4a + local GN_COMMIT=4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e local GN_TARFILE=$TERMUX_COMMON_CACHEDIR/gn_$GN_COMMIT.tar.gz local GN_SOURCE=https://gn.googlesource.com/gn/+archive/$GN_COMMIT.tar.gz @@ -30,8 +30,8 @@ termux_setup_gn() { cat <<-EOF >./out/last_commit_position.h #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM 1 - #define LAST_COMMIT_POSITION "${GN_COMMIT}" + #define LAST_COMMIT_POSITION_NUM 1945 + #define LAST_COMMIT_POSITION "1945 ${GN_COMMIT:0:8}" #endif // OUT_LAST_COMMIT_POSITION_H_ EOF ninja -C out/