diff --git a/gn/Makefile b/gn/Makefile index 14c8f8c3e..eb1c24263 100644 --- a/gn/Makefile +++ b/gn/Makefile @@ -9,17 +9,14 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2023-04-05 -PKG_SOURCE_VERSION:=28b7b6c507eb808567e3aea446cd259f7691fddc -PKG_MIRROR_HASH:=5b112442eabea4b906cc409237fac13b8efb4f5acb25989b1883d5ce96deebd2 +PKG_SOURCE_DATE:=2024-01-24 +PKG_SOURCE_VERSION:=a2e2717ea670249a34b0de4b3e54f268d320bdfa +PKG_MIRROR_HASH:=13d4b2ac0ca78cedf25ca9919c2969eb37c36b6dd5e8e6e8cd114441500daa76 PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Tianling Shen -ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),) -PKG_BUILD_DEPENDS+= ninja/host -endif PKG_HOST_ONLY:=1 HOST_BUILD_PARALLEL:=1 @@ -45,7 +42,7 @@ define Host/Configure endef define Host/Compile - ninja -C $(HOST_BUILD_DIR)/out + +$(NINJA) -C $(HOST_BUILD_DIR)/out endef define Host/Install diff --git a/gn/patches/010-gcc.patch b/gn/patches/010-gcc.patch deleted file mode 100644 index bfdc39445..000000000 --- a/gn/patches/010-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/gen.py -+++ b/build/gen.py -@@ -368,7 +368,7 @@ def WriteGNNinja(path, platform, host, o - cxx = os.environ.get('CXX', 'g++') - ld = os.environ.get('LD', 'g++') - ar = os.environ.get('AR', 'ar -X64') -- elif platform.is_msys() or platform.is_mingw(): -+ elif platform.is_msys() or platform.is_mingw() or platform.is_linux(): - cxx = os.environ.get('CXX', 'g++') - ld = os.environ.get('LD', 'g++') - ar = os.environ.get('AR', 'ar') diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h index 9c21421e8..5f82253b9 100644 --- a/gn/src/out/last_commit_position.h +++ b/gn/src/out/last_commit_position.h @@ -3,7 +3,7 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ -#define LAST_COMMIT_POSITION_NUM 2085 -#define LAST_COMMIT_POSITION "2085 (28b7b6c507eb)" +#define LAST_COMMIT_POSITION_NUM 2143 +#define LAST_COMMIT_POSITION "2143 (a2e2717ea670)" #endif // OUT_LAST_COMMIT_POSITION_H_