fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

naiveproxy: backport patch to fix building on OpenWrt x86 platform

Browse Source 
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2021-02-18 22:52:38 +08:00
parent 08ba2cb772
commit 2778bff9de
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ctcgfw/naiveproxy/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=naiveproxy
PKG_VERSION:=88.0.4324.96-1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?

22
package/ctcgfw/naiveproxy/patches/010-Fix-OpenWrt-x86-builds.patch Normal file
View File

@ -0,0 +1,22 @@
From 63f89cd454bcd1f2cdd14e63de0587a2f692cd07 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Sun, 31 Jan 2021 20:15:28 +0800
Subject: [PATCH] Fix OpenWrt x86 builds
---
src/build/toolchain/linux/BUILD.gn | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/src/build/toolchain/linux/BUILD.gn
+++ b/src/build/toolchain/linux/BUILD.gn
@@ -99,8 +99,8 @@ clang_toolchain("clang_x86") {
clang_toolchain("clang_x86_openwrt") {
# Output linker map files for binary size analysis.
enable_linker_map = true
- extra_cppflags = "--target=i386-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__"
- extra_ldflags = "--target=i386-openwrt-linux-musl"
+ extra_cppflags = "--target=i486-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__"
+ extra_ldflags = "--target=i486-openwrt-linux-musl"
toolchain_args = {
current_cpu = "x86"