Enable cross-compilation supportHEADmaster

2 files changed, 309 insertions, 6 deletions

diff --git a/crosscompile.bash b/crosscompile.bash
new file mode 100644
index 0000000..78f8b96
--- /dev/null
+++ b/crosscompile.bash
@@ -0,0 +1,70 @@
+#!/bin/bash
+# Copyright 2012 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# support functions for go cross compilation
+
+PLATFORMS="darwin/386 darwin/amd64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm windows/386 windows/amd64"
+
+function go-alias {
+	GOOS=${1%/*}
+	GOARCH=${1#*/}
+	eval "function go-${GOOS}-${GOARCH} { ( GOOS=${GOOS} GOARCH=${GOARCH} go \$@ ) }"
+}
+
+function go-crosscompile-build {
+	GOOS=${1%/*}
+	GOARCH=${1#*/}
+	cd $(go env GOROOT)/src ; GOOS=${GOOS} GOARCH=${GOARCH} ./make.bash --no-clean 2>&1
+}
+
+function go-crosscompile-build-all {
+	FAILURES=""
+	for PLATFORM in $PLATFORMS; do
+		CMD="go-crosscompile-build ${PLATFORM}"
+		echo "$CMD"
+		$CMD || FAILURES="$FAILURES $PLATFORM"
+	done
+	if [ "$FAILURES" != "" ]; then
+	    echo "*** go-crosscompile-build-all FAILED on $FAILURES ***"
+	    return 1
+	fi
+}	
+
+function go-all {
+	FAILURES=""
+	for PLATFORM in $PLATFORMS; do
+		GOOS=${PLATFORM%/*}
+		GOARCH=${PLATFORM#*/}
+		CMD="go-${GOOS}-${GOARCH} $@"
+		echo "$CMD"
+		$CMD || FAILURES="$FAILURES $PLATFORM"
+	done
+	if [ "$FAILURES" != "" ]; then
+	    echo "*** go-all FAILED on $FAILURES ***"
+	    return 1
+	fi
+}
+
+function go-build-all {
+	FAILURES=""
+	for PLATFORM in $PLATFORMS; do
+		GOOS=${PLATFORM%/*}
+		GOARCH=${PLATFORM#*/}
+		OUTPUT=`echo $@ | sed 's/\.go//'` 
+		CMD="go-${GOOS}-${GOARCH} build -o $OUTPUT-${GOOS}-${GOARCH} $@"
+		echo "$CMD"
+		$CMD || FAILURES="$FAILURES $PLATFORM"
+	done
+	if [ "$FAILURES" != "" ]; then
+	    echo "*** go-build-all FAILED on $FAILURES ***"
+	    return 1
+	fi
+}
+
+for PLATFORM in $PLATFORMS; do
+	go-alias $PLATFORM
+done
+
+unset -f go-alias
diff --git a/golang.spec b/golang.spec
index f857d77..c9003da 100644
--- a/golang.spec
+++ b/golang.spec
@@ -18,12 +18,13 @@
 
 Name:		golang
 Version:	1.1.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The Go Programming Language
 
 License:	BSD
 URL:		http://golang.org/
 Source0:	https://go.googlecode.com/files/go%{version}.src.tar.gz
+Source1:	https://raw.github.com/davecheney/golang-crosscompile/master/crosscompile.bash
 
 BuildRequires:	/bin/hostname
 BuildRequires:	emacs xemacs xemacs-packages-extra
@@ -57,6 +58,84 @@ Source101:	golang-prelink.conf
 #%{summary}.
 
 
+%ifnarch x86_64
+%package cross-linux_amd64
+Summary: Go cross-compile support for linux_amd64
+Requires: golang
+ExclusiveArch: %{ix86} %{arm}
+
+%description cross-linux_amd64
+%{summary}.
+%endif
+
+%ifnarch %{ix86}
+%package cross-linux_386
+Summary: Go cross-compile support for linux_386
+Requires: golang
+
+%description cross-linux_386
+%{summary}.
+%endif
+
+%ifnarch %{arm}
+%package cross-linux_arm
+Summary: Go cross-compile support for linux_arm
+Requires: golang
+
+%description cross-linux_arm
+%{summary}.
+%endif
+
+%package cross-darwin_amd64
+Summary: Go cross-compile support for darwin_amd64
+Requires: golang
+
+%description cross-darwin_amd64
+%{summary}.
+
+%package cross-darwin_386
+Summary: Go cross-compile support for darwin_386
+Requires: golang
+
+%description cross-darwin_386
+%{summary}.
+
+%package cross-freebsd_amd64
+Summary: Go cross-compile support for freebsd_amd64
+Requires: golang
+
+%description cross-freebsd_amd64
+%{summary}.
+
+%package cross-freebsd_386
+Summary: Go cross-compile support for freebsd_386
+Requires: golang
+
+%description cross-freebsd_386
+%{summary}.
+
+%package cross-freebsd_arm
+Summary: Go cross-compile support for freebsd_arm
+Requires: golang
+
+%description cross-freebsd_arm
+%{summary}.
+
+%package cross-windows_amd64
+Summary: Go cross-compile support for windows_amd64
+Requires: golang
+
+%description cross-windows_amd64
+%{summary}.
+
+%package cross-windows_386
+Summary: Go cross-compile support for windows_386
+Requires: golang
+
+%description cross-windows_386
+%{summary}.
+
+
 %package vim
 Summary: Vim plugins for Go
 Requires:    vim-filesystem
@@ -121,7 +200,11 @@ export GOROOT_FINAL=%{_libdir}/%{name}
 
 # build
 cd src
-./make.bash
+./make.bash --no-clean
+cd ..
+export GOROOT=$(pwd -P)
+cd src
+bash -c ". %{SOURCE1} ; go-crosscompile-build-all"
 cd ..
 
 # build static version of documentation
@@ -168,7 +251,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/%{name}/doc/Makefile
 
 # add symlinks for binaries
 pushd $RPM_BUILD_ROOT%{_bindir}
-for z in $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/*
+for z in $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/go*
   do ln -s %{_libdir}/%{name}/bin/$(basename $z)
 done
 popd
@@ -213,8 +296,55 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
 %files
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS VERSION
 
-# go files
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/api
+%{_libdir}/%{name}/bin/go
+%{_libdir}/%{name}/bin/godoc
+%{_libdir}/%{name}/bin/gofmt
+
+%{_libdir}/%{name}/doc
+%{_libdir}/%{name}/favicon.ico
+%{_libdir}/%{name}/include
+%{_libdir}/%{name}/lib
+%{_libdir}/%{name}/robots.txt
+%{_libdir}/%{name}/src
+%dir %{_libdir}/%{name}/pkg
+%dir %{_libdir}/%{name}/pkg/obj
+%dir %{_libdir}/%{name}/pkg/tool
+
+
+%ifarch x86_64
+%dir %{_libdir}/%{name}/pkg/linux_amd64
+%{_libdir}/%{name}/pkg/linux_amd64
+%dir %{_libdir}/%{name}/pkg/obj/linux_amd64
+%{_libdir}/%{name}/pkg/obj/linux_amd64
+%dir %{_libdir}/%{name}/pkg/tool/linux_amd64
+%{_libdir}/%{name}/pkg/tool/linux_amd64
+%dir %{_libdir}/%{name}/pkg/obj/linux_amd64
+%{_libdir}/%{name}/pkg/obj/linux_amd64
+%endif
+
+%ifarch %{ix86}
+%dir %{_libdir}/%{name}/pkg/linux_386
+%{_libdir}/%{name}/pkg/linux_386
+%dir %{_libdir}/%{name}/obj/linux_386
+%{_libdir}/%{name}/obj/linux_386
+%dir %{_libdir}/%{name}/tool/linux_386
+%{_libdir}/%{name}/tool/linux_386
+%dir %{_libdir}/%{name}/pkg/obj/linux_386
+%{_libdir}/%{name}/pkg/obj/linux_386
+%endif
+
+%ifarch %{arm}
+%dir %{_libdir}/%{name}/pkg/linux_arm
+%{_libdir}/%{name}/pkg/linux_arm
+%dir %{_libdir}/%{name}/obj/linux_arm
+%{_libdir}/%{name}/obj/linux_arm
+%dir %{_libdir}/%{name}/tool/linux_arm
+%{_libdir}/%{name}/tool/linux_arm
+%dir %{_libdir}/%{name}/pkg/obj/linux_arm
+%{_libdir}/%{name}/pkg/obj/linux_arm
+%endif
 
 # bin symlinks
 %{_bindir}/go
@@ -231,12 +361,112 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
 # prelink blacklist
 %{_sysconfdir}/prelink.conf.d
 
+%ifnarch x86_64
+%files cross-linux_amd64
+%dir %{_libdir}/%{name}/bin/linux_amd64
+%{_libdir}/%{name}/bin/linux_amd64
+
+%dir %{_libdir}/%{name}/pkg/linux_amd64
+%{_libdir}/%{name}/pkg/linux_amd64
+%dir %{_libdir}/%{name}/pkg/tool/linux_amd64
+%{_libdir}/%{name}/pkg/tool/linux_amd64
+%endif
+
+%ifnarch %{ix86}
+%files cross-linux_386
+%dir %{_libdir}/%{name}/bin/linux_386
+%{_libdir}/%{name}/bin/linux_386
+
+%dir %{_libdir}/%{name}/pkg/linux_386
+%{_libdir}/%{name}/pkg/linux_386
+%dir %{_libdir}/%{name}/pkg/tool/linux_386
+%{_libdir}/%{name}/pkg/tool/linux_386
+%endif
+
+%ifnarch %{arm}
+%files cross-linux_arm
+%dir %{_libdir}/%{name}/bin/linux_arm
+%{_libdir}/%{name}/bin/linux_arm
+
+%dir %{_libdir}/%{name}/pkg/linux_arm
+%{_libdir}/%{name}/pkg/linux_arm
+%dir %{_libdir}/%{name}/pkg/tool/linux_arm
+%{_libdir}/%{name}/pkg/tool/linux_arm
+%endif
+
+%files cross-darwin_amd64
+%dir %{_libdir}/%{name}/bin/darwin_amd64
+%{_libdir}/%{name}/bin/darwin_amd64
+
+%dir %{_libdir}/%{name}/pkg/darwin_amd64
+%{_libdir}/%{name}/pkg/darwin_amd64
+%dir %{_libdir}/%{name}/pkg/tool/darwin_amd64
+%{_libdir}/%{name}/pkg/tool/darwin_amd64
+
+
+%files cross-darwin_386
+%dir %{_libdir}/%{name}/bin/darwin_386
+%{_libdir}/%{name}/bin/darwin_386
+
+%dir %{_libdir}/%{name}/pkg/darwin_386
+%{_libdir}/%{name}/pkg/darwin_386
+%dir %{_libdir}/%{name}/pkg/tool/darwin_386
+%{_libdir}/%{name}/pkg/tool/darwin_386
+
+
+%files cross-freebsd_amd64
+%dir %{_libdir}/%{name}/bin/freebsd_amd64
+%{_libdir}/%{name}/bin/freebsd_amd64
+
+%dir %{_libdir}/%{name}/pkg/freebsd_amd64
+%{_libdir}/%{name}/pkg/freebsd_amd64
+%dir %{_libdir}/%{name}/pkg/tool/freebsd_amd64
+%{_libdir}/%{name}/pkg/tool/freebsd_amd64
+
+
+%files cross-freebsd_386
+%dir %{_libdir}/%{name}/bin/freebsd_386
+%{_libdir}/%{name}/bin/freebsd_386
+
+%dir %{_libdir}/%{name}/pkg/freebsd_386
+%{_libdir}/%{name}/pkg/freebsd_386
+%dir %{_libdir}/%{name}/pkg/tool/freebsd_386
+%{_libdir}/%{name}/pkg/tool/freebsd_386
+
+%files cross-freebsd_arm
+%dir %{_libdir}/%{name}/bin/freebsd_arm
+%{_libdir}/%{name}/bin/freebsd_arm
+
+%dir %{_libdir}/%{name}/pkg/freebsd_arm
+%{_libdir}/%{name}/pkg/freebsd_arm
+%dir %{_libdir}/%{name}/pkg/tool/freebsd_arm
+%{_libdir}/%{name}/pkg/tool/freebsd_arm
+
+
+%files cross-windows_amd64
+%dir %{_libdir}/%{name}/bin/windows_amd64
+%{_libdir}/%{name}/bin/windows_amd64
+
+%dir %{_libdir}/%{name}/pkg/windows_amd64
+%{_libdir}/%{name}/pkg/windows_amd64
+%dir %{_libdir}/%{name}/pkg/tool/windows_amd64
+%{_libdir}/%{name}/pkg/tool/windows_amd64
+
+
+%files cross-windows_386
+%dir %{_libdir}/%{name}/bin/windows_386
+%{_libdir}/%{name}/bin/windows_386
+
+%dir %{_libdir}/%{name}/pkg/windows_386
+%{_libdir}/%{name}/pkg/windows_386
+%dir %{_libdir}/%{name}/pkg/tool/windows_386
+%{_libdir}/%{name}/pkg/tool/windows_386
+
 
 %files vim
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS
 %{_datadir}/vim/vimfiles/*
 
-
 %files -n emacs-%{name}
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS
 %{_emacs_sitelispdir}/%{name}
@@ -250,6 +480,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
 
 
 %changelog
+* Sun Aug 04 2013 Paul Komkoff <i@stingr.net> - 1.1.1-7
+- Enable cross-compilation support. Secondary architectures are built as separate packages.
+
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.1.1-6
 - Perl 5.18 rebuild