Skip to contentSkip to conversation

mpfr & gmp updates

PATCH In review Marko Lindqvist 2 participants 6 messages Jan 2, 2013 – Jan 8, 2013

lore
Share & tools
lore
#0 lore raw

Objective of this patch series is to update gmp to latest versions before fixing automake-1.13 problems. Doing it the other way around could mean more work (porting the patch from one gmp version to next)

[PATCH 1/3] mpfr: update to upstream version 3.1.1

gmp-5.1.0 compilation fails with mpfr-3.1.0. Mpfr update fixes thath.

[PATCH 2/3] gmp: update SRC_URI and HOMEPAGE

Use gmplib SRC_URI instead of gnu mirror one. Latter doesn't even have latest version available. Old HOMEPAGE URL gave "page not found".

[PATCH 3/3] gmp: update to upstream version 5.1.0

- ML

#1 lore raw

PATCH 1/3 mpfr: update to upstream version 3.1.1

mpfr_fix_for_automake-1.12.patch part of upstream now.

---
 .../mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch    |   35 --------------------
 .../long-long-thumb.patch                          |    0
 .../mpfr/{mpfr_3.1.0.bb => mpfr_3.1.1.bb}          |    7 ++--
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch
 rename meta/recipes-support/mpfr/{mpfr-3.1.0 => mpfr-3.1.1}/long-long-thumb.patch (100%)
 rename meta/recipes-support/mpfr/{mpfr_3.1.0.bb => mpfr_3.1.1.bb} (65%)
meta/recipes-support/mpfr/mpfr-3.1.0/mpfr_fix_for_automake-1.12.patch deleted +0 -35
deleted file mode 100644
index 5b0a24a..0000000
@@ -1,35 +0,0 @@
-Upstream-Status: Pending
-
-this patch avoids these issues with automake 1.12
-
-| configure.ac:304: error: automatic de-ANSI-fication support has been removed
-| tests/Makefile.am:12: error: automatic de-ANSI-fication support has been removed
-
-Signed-Off-By: Nitin A Kamble <[email protected]>
-2012/05/02
-
-Index: mpfr-3.1.0/configure.ac
-===================================================================
---- mpfr-3.1.0.orig/configure.ac
-+++ mpfr-3.1.0/configure.ac
-@@ -301,7 +301,6 @@ if test "$test_CFLAGS" != set && test -n
- fi
- 
- AM_PROG_CC_C_O
--AM_C_PROTOTYPES
- 
- case $host in
-   *-apple-darwin*)
-Index: mpfr-3.1.0/tests/Makefile.am
-===================================================================
---- mpfr-3.1.0.orig/tests/Makefile.am
-+++ mpfr-3.1.0/tests/Makefile.am
-@@ -9,7 +9,7 @@
- # PARTICULAR PURPOSE.
- 
- 
--AUTOMAKE_OPTIONS = 1.6 gnu $(top_builddir)/ansi2knr
-+AUTOMAKE_OPTIONS = 1.6 gnu
- 
- # tversion is run
- #   * at the beginning so that the user gets a possible version error
meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch renamed from meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch +0 -0
similarity index 100%
rename from meta/recipes-support/mpfr/mpfr-3.1.0/long-long-thumb.patch
rename to meta/recipes-support/mpfr/mpfr-3.1.1/long-long-thumb.patch
meta/recipes-support/mpfr/mpfr_3.1.1.bb renamed from meta/recipes-support/mpfr/mpfr_3.1.0.bb +3 -4
similarity index 65%
rename from meta/recipes-support/mpfr/mpfr_3.1.0.bb
rename to meta/recipes-support/mpfr/mpfr_3.1.1.bb
index e7e20ce..7f34e71 100644
@@ -3,15 +3,14 @@ LICENSE="GPLv3&LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "gmp"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \
            file://long-long-thumb.patch \
-           file://mpfr_fix_for_automake-1.12.patch \
            "
 
-SRC_URI[md5sum] = "238ae4a15cc3a5049b723daef5d17938"
-SRC_URI[sha256sum] = "74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680"
+SRC_URI[md5sum] = "e90e0075bb1b5f626c6e31aaa9c64e3b"
+SRC_URI[sha256sum] = "7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd"
 S = "${WORKDIR}/mpfr-${PV}"
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 gmp: update SRC_URI and HOMEPAGE

Fetch from gmplib.org instead of gnu mirror. List gmplib.org as homepage instead of old broken URL.

---
 meta/recipes-support/gmp/gmp.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/gmp/gmp.inc +2 -2
index 789d6d0..823811f 100644
@@ -1,9 +1,9 @@
 SECTION = "devel"
 DESCRIPTION = "GNU multiprecision arithmetic library"
-HOMEPAGE = "http://www.swox.com/gmp/"
+HOMEPAGE = "http://gmplib.org/"
 LICENSE = "GPLv3 LGPLv3"
 
-SRC_URI = "${GNU_MIRROR}/gmp/gmp-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gmplib.org/pub/gmp-${PV}/gmp-${PV}.tar.bz2 \
 	   file://configure.patch \
 	   file://amd64.patch "
 
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/3 gmp: update to upstream version 5.1.0

New version of configure.patch added for gmp-5.1.0. Old patch moved to gmp-4.2.1 specific directory. gmp_fix_for_automake-1.12.patch part of upstŕeam so removed gmp-5 version, gmp-4.2.1 version remains.

---
 .../gmp/{gmp => gmp-4.2.1}/configure.patch         |    0
 meta/recipes-support/gmp/gmp-5.1.0/configure.patch |  210 ++++++++++++++++++++
 .../gmp/gmp/gmp_fix_for_automake-1.12.patch        |   48 -----
 .../gmp/{gmp_5.0.5.bb => gmp_5.1.0.bb}             |    5 +-
 4 files changed, 212 insertions(+), 51 deletions(-)
 rename meta/recipes-support/gmp/{gmp => gmp-4.2.1}/configure.patch (100%)
 create mode 100644 meta/recipes-support/gmp/gmp-5.1.0/configure.patch
 delete mode 100644 meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch
 rename meta/recipes-support/gmp/{gmp_5.0.5.bb => gmp_5.1.0.bb} (60%)
meta/recipes-support/gmp/gmp-4.2.1/configure.patch renamed from meta/recipes-support/gmp/gmp/configure.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gmp/gmp/configure.patch
rename to meta/recipes-support/gmp/gmp-4.2.1/configure.patch
meta/recipes-support/gmp/gmp-5.1.0/configure.patch new file +210 -0

210 lines not on this page · raw message

meta/recipes-support/gmp/gmp/gmp_fix_for_automake-1.12.patch deleted +0 -48

48 lines not on this page · raw message

meta/recipes-support/gmp/gmp_5.1.0.bb renamed from meta/recipes-support/gmp/gmp_5.0.5.bb +2 -3
similarity index 60%
rename from meta/recipes-support/gmp/gmp_5.0.5.bb
rename to meta/recipes-support/gmp/gmp_5.1.0.bb
index d91340c..9cb80fe 100644
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI_append = " file://use-includedir.patch \
                    file://gmp_fix_for_x32.patch \
-                   file://gmp_fix_for_automake-1.12.patch \
                    "
 
-SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe"
-SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9"
+SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"
+SRC_URI[sha256sum] = "dfd9aba98fe5caa54a715b4584c7d45eb0ee0c8be9a3181164ad2fad5eefc796"
Signature · 1 line
1.7.10.4
#4 lore raw

Re: [PATCH 3/3] gmp: update to upstream version 5.1.0

W dniu 02.01.2013 19:37, Marko Lindqvist pisze:

Quoted 4 lines

New version of configure.patch added for gmp-5.1.0. Old patch moved to gmp-4.2.1 specific directory. gmp_fix_for_automake-1.12.patch part of upstŕeam so removed gmp-5 version, gmp-4.2.1 version remains.

This update broke our AArch64 builds. Will have to check why and fix it.

#5 lore raw

PATCH 1/1 gmp: add patch from upstream to unbreak AArch64

---
 .../gmp/gmp-5.1.0/187b7b1646ee.patch               | 44 ++++++++++++++++++++++
 meta/recipes-support/gmp/gmp_5.1.0.bb              |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch
meta/recipes-support/gmp/gmp-5.1.0/187b7b1646ee.patch new file +44 -0
new file mode 100644
index 0000000..486f8c5
@@ -0,0 +1,44 @@
+Upstream-status: Backport
+
+# HG changeset patch
+# User Torbjorn Granlund <[email protected]>
+# Date 1357413121 -3600
+# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
+# Parent  87a24013e9ee2cabf74e32282c18584a2c669009
+(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
+
+diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
+--- a/longlong.h	Fri Jan 04 16:32:01 2013 +0100
++++ b/longlong.h	Sat Jan 05 20:12:01 2013 +0100
+@@ -530,23 +530,16 @@
+ #endif /* __arm__ */
+ 
+ #if defined (__aarch64__) && W_TYPE_SIZE == 64
++/* FIXME: Extend the immediate range for the low word by using both
++   ADDS and SUBS, since they set carry in the same way.  */
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+-  __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
++  __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3"			\
+ 	   : "=r" (sh), "=&r" (sl)					\
+-	   : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
++	   : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+-  do {									\
+-    if (__builtin_constant_p (bl))					\
+-      {									\
+-	__asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
+-		 : "=r" (sh), "=&r" (sl)				\
+-		 : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
+-      }									\
+-    else /* only bh might be a constant */				\
+-      __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
+-	       : "=r" (sh), "=&r" (sl)					\
+-	       : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
+-    } while (0)
++  __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3"			\
++	   : "=r,r" (sh), "=&r,&r" (sl)					\
++	   : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
+ #define umul_ppmm(ph, pl, m0, m1) \
+   do {									\
+     UDItype __m0 = (m0), __m1 = (m1);					\
+
meta/recipes-support/gmp/gmp_5.1.0.bb +1 -0
index 9cb80fe..eb5ef33 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI_append = " file://use-includedir.patch \
                    file://gmp_fix_for_x32.patch \
+                   file://187b7b1646ee.patch \
                    "
 
 SRC_URI[md5sum] = "362cf515aff8dc240958ce47418e4c78"
Signature · 1 line
1.8.0