Patchwork aarch64 support in isl

login
register
mail settings
Submitter Efraim Flashner
Date Oct. 6, 2016, 6:28 a.m.
Message ID <20161006062808.GA32620@macbook42.flashner.co.il>
Download mbox | patch
Permalink /patch/16298/
State New
Headers show

Comments

Efraim Flashner - Oct. 6, 2016, 6:28 a.m.
This one is for core-updates. I've been carrying it around for months
and short of updating isl or running autoconf on it before building it's
needed for creating the cross-arch bootstrap tarballs.

I'm still working on the aarch64 bootstrap binaries, still trying to get
that to work.
Ludovic Courtès - Oct. 6, 2016, 7:32 p.m.
Efraim Flashner <efraim@flashner.co.il> skribis:

> This one is for core-updates. I've been carrying it around for months
> and short of updating isl or running autoconf on it before building it's
> needed for creating the cross-arch bootstrap tarballs.
>
> I'm still working on the aarch64 bootstrap binaries, still trying to get
> that to work.

Neat.

> From 8ad86edcc221e3505a645a3b75a8931efaa3f588 Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> Date: Fri, 24 Jun 2016 13:33:31 +0300
> Subject: [PATCH 2/3] gnu: isl: Add support for aarch64.
>
> * gnu/packages/gcc.scm (isl)[source]: Add patch.
> * gnu/packages/patches/isl-0.11.1-aarch64-support.patch: New variable.

s/variable/file/ :-)

> * gnu/local.mk (dist_patch_DATA): Register it.

[...]

> --- /dev/null
> +++ b/gnu/packages/patches/isl-0.11.1-aarch64-support.patch
> @@ -0,0 +1,43 @@
> +From 5ad856cba44446d08ae9e788198a7d56ef4e1c87 Mon Sep 17 00:00:00 2001
> +From: Efraim Flashner <efraim@flashner.co.il>
> +Date: Thu, 23 Jun 2016 09:39:56 +0300
> +Subject: [PATCH] autoreconf
> +
> +---
> + config.guess          |    7 +++++++
> + config.sub            |    1 +
> + 2 files changed, 8 insertions(+)

You can remove this header and instead write “Add aarch64 support to
config.guess” or similar.

Otherwise OK for core-updates.

Thanks!

Ludo’.

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 4b83de2..d0edf79 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -572,6 +572,7 @@  dist_patch_DATA =						\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
   %D%/packages/patches/inkscape-drop-wait-for-targets.patch	\
   %D%/packages/patches/irrlicht-mesa-10.patch			\
+  %D%/packages/patches/isl-0.11.1-aarch64-support.patch	\
   %D%/packages/patches/jansson-CVE-2016-4425.patch		\
   %D%/packages/patches/jasper-CVE-2007-2721.patch		\
   %D%/packages/patches/jasper-CVE-2008-3520.patch		\
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 1ca8ca0..b846ab4 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -3,7 +3,7 @@ 
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -717,7 +717,8 @@  as the 'native-search-paths' field."
                                        name "-" version ".tar.gz")))
              (sha256
               (base32
-               "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"))))
+               "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"))
+             (patches (search-patches "isl-0.11.1-aarch64-support.patch"))))
     (build-system gnu-build-system)
     (inputs `(("gmp" ,gmp)))
     (home-page "http://isl.gforge.inria.fr/")
diff --git a/gnu/packages/patches/isl-0.11.1-aarch64-support.patch b/gnu/packages/patches/isl-0.11.1-aarch64-support.patch
new file mode 100644
index 0000000..b148144
--- /dev/null
+++ b/gnu/packages/patches/isl-0.11.1-aarch64-support.patch
@@ -0,0 +1,43 @@ 
+From 5ad856cba44446d08ae9e788198a7d56ef4e1c87 Mon Sep 17 00:00:00 2001
+From: Efraim Flashner <efraim@flashner.co.il>
+Date: Thu, 23 Jun 2016 09:39:56 +0300
+Subject: [PATCH] autoreconf
+
+---
+ config.guess          |    7 +++++++
+ config.sub            |    1 +
+ 2 files changed, 8 insertions(+)
+
+diff --git a/config.guess b/config.guess
+index 40eaed4..baad294 100755
+--- a/config.guess
++++ b/config.guess
+@@ -861,6 +861,13 @@ EOF
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+diff --git a/config.sub b/config.sub
+index 30fdca8..8f5b018 100755
+--- a/config.sub
++++ b/config.sub
+@@ -247,6 +247,7 @@ case $basic_machine in
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-- 
+2.9.0
+