diff options
| author | navigaid | 2019-09-12 20:21:46 +0800 |
|---|---|---|
| committer | navigaid | 2019-09-12 20:21:46 +0800 |
| commit | 684e75e3da280abe1c6ac2f5f79c67e850050799 (patch) | |
| tree | dc9ce7185e887c5afa333ff9292cb9eb4938441b | |
| parent | 298d4ecbb2e500fd9ca31283d4a72f7dc12d394c (diff) | |
| download | aur-684e75e3da280abe1c6ac2f5f79c67e850050799.tar.gz | |
fix uname -m
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rwxr-xr-x | build_x86.sh | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -8,12 +8,13 @@ pkgbase = naiveproxy makedepends = git makedepends = ninja makedepends = cmake + makedepends = gn depends = nspr depends = nss source = naiveproxy.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v76.0.3809.87-2.tar.gz source = build_x86.sh md5sums = f3b1ba2190b0564cc7e38aa6a2147676 - md5sums = d1f92f0e8adf70ceb65343c77cfa0e33 + md5sums = 5257d87a1b4db16c8eb24e19d2570ed6 pkgname = naiveproxy diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..a7304d847271 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/pkg/ +/src/ +/naiveproxy* @@ -8,16 +8,16 @@ arch=('any') url='https://github.com/klzgrad/naiveproxy' license=('BSD') depends=('nspr' 'nss') -makedepends=('git' 'ninja' 'cmake') +makedepends=('git' 'ninja' 'cmake' 'gn') source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz" "build_x86.sh") md5sums=('f3b1ba2190b0564cc7e38aa6a2147676' - 'd1f92f0e8adf70ceb65343c77cfa0e33') + '5257d87a1b4db16c8eb24e19d2570ed6') build(){ pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel} ./tools/import-upstream.sh - if [[ "$(uname -m)" =~ ^(i386|i386)$ ]]; then + if [[ "$(uname -m)" =~ ^(i686|i386)$ ]]; then ( cd src; ../../build_x86.sh ) else ( cd src; ./get-clang.sh ) diff --git a/build_x86.sh b/build_x86.sh index a1b3961a4187..ccce608e3615 100755 --- a/build_x86.sh +++ b/build_x86.sh @@ -70,6 +70,6 @@ mkdir -p out python2=$(which python2 2>/dev/null || which python 2>/dev/null) export DEPOT_TOOLS_WIN_TOOLCHAIN=0 -./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2 +gn gen "$out" --args="$flags" --script-executable=$python2 ninja -C "$out" naive |