Browse Source

naiveproxy: update to 127.0.6533.64-2 (#1518)

* naiveproxy: update to 127.0.6533.64-2

* naiveproxy: improve support for mips32
zxl hhyccc 1 năm trước cách đây
mục cha
commit
b58e9a2c87
2 tập tin đã thay đổi với 15 bổ sung7 xóa
  1. 6 6
      naiveproxy/Makefile
  2. 9 1
      naiveproxy/src/init_env.sh

+ 6 - 6
naiveproxy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=125.0.6422.35-1
+PKG_VERSION:=127.0.6533.64-2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=fd1fdab08aa00f19fb6ca1cb80cc132ab5a8d2bd3c95fa4ba41b3d79fbc88ebd
+PKG_HASH:=1eeb7c9cfc5ec36d100c559285ec0946cc5a032a9d178b61ec7b15402e5f8d16
 
 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -55,22 +55,22 @@ ifneq ($(CONFIG_CCACHE),)
   export naive_ccache_flags=cc_wrapper="$(CCACHE)"
 endif
 
-CLANG_VER:=19-init-8091-gab037c4f-1
+CLANG_VER:=19-init-10646-g084e2b53-57
 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz
 define Download/CLANG
 	URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64
 	URL_FILE:=$(CLANG_FILE)
 	FILE:=$(CLANG_FILE)
-	HASH:=6b797d118cc593eca0f2e568169295a5a9b65ddabed2de34b9a201a4bb7990f5
+	HASH:=256569cef49a1a955570a3026b8910689cac106a1336238f592296c544f6b8c3
 endef
 
-PGO_VER:=6422-1715102072-9bdbfa29f2bb1ff28f0f031b98501a1193b8d03b-13cfbf145656b369f9c23bff70ab2fb07e1e2fdb
+PGO_VER:=6533-1721647559-b59d3252e50dcc0e34a9d5ca3790d80421583ca4-419f07950174cbcea67e9a8035fcc0a2ced2ff1e
 PGO_FILE:=chrome-linux-$(PGO_VER).profdata
 define Download/PGO_PROF
 	URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles
 	URL_FILE:=$(PGO_FILE)
 	FILE:=$(PGO_FILE)
-	HASH:=5a0b3d3f75c536cade97f15a71c17424c868948fa26a8267488bd588756b66af
+	HASH:=4cc810ce3d9f9979a6dbcd6df1c65c8070ab7635f399af3b0bfc7df3f17083c3
 endef
 
 define Build/Prepare

+ 9 - 1
naiveproxy/src/init_env.sh

@@ -86,13 +86,18 @@ case "${target_arch}" in
 	else
 		naive_flags+=" arm_float_abi=\"soft\" arm_use_neon=false"
 	fi
+
+	# LLVM does not accept muslgnueabi as the target triple environment
+	if [ -d "$toolchain_dir/lib/gcc/arm-openwrt-linux-muslgnueabi" ] && [ ! -d "$toolchain_dir/lib/gcc/arm-openwrt-linux-musleabi" ]; then
+		ln -sf "$toolchain_dir/lib/gcc/arm-openwrt-linux-muslgnueabi" "$toolchain_dir/lib/gcc/arm-openwrt-linux-musleabi"
+	fi
 	;;
 "arm64")
 	[ -n "${cpu_type}" ] && naive_flags+=" arm_cpu=\"${cpu_type}\""
 	;;
 "mipsel"|"mips64el")
 	naive_flags+=" use_thin_lto=false chrome_pgo_phase=0"
-	if [ -z "${cpu_type}" ]; then
+	if [ -z "${cpu_type}" ] || [ "${cpu_type}" == "mips32" ]; then
 		naive_flags+=" mips_arch_variant=\"r1\""
 	else
 		naive_flags+=" mips_arch_variant=\"r2\""
@@ -105,4 +110,7 @@ case "${target_arch}" in
 		fi
 	fi
 	;;
+"x86_64")
+	naive_flags+=" use_cfi_icall=false"
+	;;
 esac