update

4 files changed, 15 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9dae76347c4..6595c6f9dc21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ pkgbase = naiveproxy
 	pkgver = 76.0.3809.87
 	pkgrel = 2
 	url = https://github.com/klzgrad/naiveproxy
-	arch = any
+	arch = x86_64
 	license = BSD
 	makedepends = git
 	makedepends = ninja
@@ -12,9 +12,7 @@ pkgbase = naiveproxy
 	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 = 5257d87a1b4db16c8eb24e19d2570ed6
 
 pkgname = naiveproxy
 
diff --git a/PKGBUILD b/PKGBUILD
index 024684ad1045..454725a033e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,31 +4,18 @@ pkgname=naiveproxy
 pkgdesc='Make a fortune quietly'
 pkgver=76.0.3809.87
 pkgrel=2
-arch=('any')
+arch=('x86_64')
 url='https://github.com/klzgrad/naiveproxy'
 license=('BSD')
 depends=('nspr' 'nss')
 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'
-         '5257d87a1b4db16c8eb24e19d2570ed6')
+source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz")
+md5sums=('f3b1ba2190b0564cc7e38aa6a2147676')
 
 build(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  ./tools/import-upstream.sh
-  if [[ "$(uname -m)" =~ ^(i686|i386)$ ]]; then
-    ( cd src; ../../build_x86.sh )
-  else
-    ( cd src; ./get-clang.sh )
-    ( cd src; ./build.sh )
-  fi
-  popd
-}
-
-check(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  # ./tests/basic.sh src/out/Release/naive
+  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
+  ./get-clang.sh
+  ./build.sh
   popd
 }
 
diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..fe8b1ea3a13a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+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
+```
diff --git a/build_x86.sh b/build_x86.sh
index ccce608e3615..5a094d701b35 100755
--- a/build_x86.sh
+++ b/build_x86.sh
@@ -32,7 +32,8 @@ elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
 fi
 
 flags="$flags"'
-  is_clang=false
+  target_cpu="x86"
+  is_clang=clang
   linux_use_bundled_binutils=false
 
   fatal_linker_warnings=false