support linux x86 build

4 files changed, 42 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 454725a033e3..30a424a57a71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86_64')
 url='https://github.com/klzgrad/naiveproxy'
 license=('BSD')
 depends=('nspr' 'nss')
-makedepends=('git' 'ninja' 'cmake' 'gn')
+makedepends=('git' 'ninja' 'cmake')
 source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz")
 md5sums=('f3b1ba2190b0564cc7e38aa6a2147676')
 
diff --git a/PKGBUILD.x86 b/PKGBUILD.x86
new file mode 100644
index 000000000000..0abd36dfaced
--- /dev/null
+++ b/PKGBUILD.x86
@@ -0,0 +1,34 @@
+# Maintainer: navigaid <navigaid@gmail.com>
+
+pkgname=naiveproxy
+pkgdesc='Make a fortune quietly'
+pkgver=76.0.3809.87
+pkgrel=2
+arch=('any')
+url='https://github.com/klzgrad/naiveproxy'
+license=('BSD')
+depends=('nspr' 'nss')
+makedepends=('git' 'ninja' 'cmake')
+source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz"
+        "build_x86.sh")
+md5sums=('f3b1ba2190b0564cc7e38aa6a2147676'
+         '665ed2cf07bd64361865ceb71a3ba34e')
+
+build(){
+  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
+  ./get-clang.sh
+  ../../build_x86.sh || true
+  pushd out/Release
+  sudo docker run -it -v $PWD:$PWD -w $PWD navigaid/naiveproxy-arch32-base:latest clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -m32 -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
+  popd
+  popd
+}
+
+package(){
+  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
+  install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
+  install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
+  install -Dm644 README.md ${pkgdir}/usr/share/doc/naiveproxy/README.md
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/naiveproxy/LICENSE
+  popd
+}
diff --git a/README.md b/README.md
index fe8b1ea3a13a..4c2adb5e9b53 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,8 @@ how to build 32-bit Linux executable manually
 linux-x86_64 > src/naiveproxy-76.0.3809.87-2/src $ build_x86.sh
 linux-i{3,6}86 > src/naiveproxy-76.0.3809.87-2/src/out/Release $ clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -m32 -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
 ```
+
+how to create arch32 builder docker image
+```
+sudo pacstrap -c . base base-devel git ninja cmake nspr nss clang
+```
diff --git a/build_x86.sh b/build_x86.sh
index 5a094d701b35..ed506c555dc5 100755
--- a/build_x86.sh
+++ b/build_x86.sh
@@ -33,7 +33,7 @@ fi
 
 flags="$flags"'
   target_cpu="x86"
-  is_clang=clang
+  is_clang=true
   linux_use_bundled_binutils=false
 
   fatal_linker_warnings=false
@@ -71,6 +71,6 @@ mkdir -p out
 python2=$(which python2 2>/dev/null || which python 2>/dev/null)
 export DEPOT_TOOLS_WIN_TOOLCHAIN=0
 
-gn gen "$out" --args="$flags" --script-executable=$python2
+./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2
 
 ninja -C "$out" naive