[arch-commits] Commit in go/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Monday, September 2, 2013 @ 12:20:53
  Author: arodseth
Revision: 96608

Enabling SSE2 caused problems for i686 users.

Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2013-09-02 10:16:37 UTC (rev 96607)
+++ PKGBUILD    2013-09-02 10:20:53 UTC (rev 96608)
@@ -8,11 +8,9 @@
 # Contributor: Mike Rosset <mike.ros...@gmail.com>
 # Contributor: Daniel YC Lin <dlin...@gmail.com>
 
-# TODO: Create split packages for the crosscompilation versions. Maybe.
-
 pkgname=go
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
@@ -24,17 +22,17 @@
 install="$pkgname.install"
 backup=('usr/lib/go/bin')
 
-#if [ "$CARCH" == 'x86_64' ]; then
-#  
source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz";
-#          "$pkgname.sh")
-#  
sha256sums=('ad583ff91bd2955fc48d24001785587e3c3b5ce5c09e4971a37028db4c3f6a98'
-#            
'36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181')
-#else
+if [ "$CARCH" == 'x86_64' ]; then
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz";
+          "$pkgname.sh")
+  
sha256sums=('ad583ff91bd2955fc48d24001785587e3c3b5ce5c09e4971a37028db4c3f6a98'
+            '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181')
+else
   source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz";
           "$pkgname.sh")
   
sha256sums=('56f384c973e58c098ec462bcd892a7c1166b9a392461970ddb22d57ed4d495af'
             '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181')
-#fi
+fi
 
 build() {
   cd "$srcdir/$pkgname/src"
@@ -41,6 +39,10 @@
 
   export GOROOT_FINAL=/usr/lib/go
 
+  # We don't support SSE2 for i686, since many i686 CPUs don't have that.
+  # Build this package manually, build Go from AUR or use x86_64 instead.
+  export GO386=387
+
   # Enable ARM crosscompilation for linux
   export GOOS=linux
   export GOARCH=arm
@@ -59,6 +61,8 @@
 check() {
   cd "$srcdir/$pkgname"
 
+  export GO386=387
+
   export GOOS=linux
   if [ "$CARCH" == 'x86_64' ]; then
     export GOARCH=amd64