summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornavigaid2019-10-01 20:26:39 +0800
committernavigaid2019-10-01 20:26:39 +0800
commit670a13172454986b07ce6a764d985dc4fe269cb4 (patch)
treee5bba440d7c528b39f9401c22883ea2757d68823
parent033a0e2203b188cdcfe29ac457f7353e969b7dca (diff)
downloadaur-670a13172454986b07ce6a764d985dc4fe269cb4.tar.gz
fix link error on armv7
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
-rwxr-xr-xbuild.sh3
3 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cf1e2c95d711..1bdf756e654a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,9 +7,10 @@ pkgbase = naiveproxy-git
license = BSD
makedepends = clang
makedepends = lld
+ makedepends = ninja
makedepends = gn
- makedepends = unzip
makedepends = python2
+ makedepends = gcc
makedepends = llvm
depends = nspr
depends = nss
diff --git a/PKGBUILD b/PKGBUILD
index 04f551317f5f..cb5da656bbc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ license=('BSD')
depends=('nspr' 'nss')
source=('git+https://github.com/klzgrad/naiveproxy.git'
'build.sh')
-makedepends=("clang" "lld" "gn" "unzip" "python2" "llvm")
+makedepends=("clang" "lld" "ninja" "gn" "python2" "gcc" "llvm")
optdepends=("ccache: Speed up compilation")
backup=(etc/naiveproxy/config.json)
md5sums=('SKIP'
diff --git a/build.sh b/build.sh
index 63fa44ffdaff..ac19ed2cedba 100755
--- a/build.sh
+++ b/build.sh
@@ -80,4 +80,7 @@ export DEPOT_TOOLS_WIN_TOOLCHAIN=0
gn gen "$out" --args="$flags" --script-executable=$python2
+cp -v /usr/lib/gcc/$(gcc -dumpmachine)/$(gcc -dumpversion)/crtbeginS.o "$out"
+cp -v /usr/lib/gcc/$(gcc -dumpmachine)/$(gcc -dumpversion)/crtendS.o "$out"
+
ninja -C "$out" naive