From 472e4e10b83fe17ab025f344973bef23dc6d960c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Nov 2006 20:36:11 +0000 Subject: [PATCH] gmp: Upgrade to 4.2.1 from OE.dev git-svn-id: https://svn.o-hand.com/repos/poky/trunk@896 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/gmp/gmp-4.1.2/amd64.patch | 16 - meta/packages/gmp/gmp-4.1.2/configure.patch | 864 --------------------- meta/packages/gmp/gmp-4.1.2/gcc-compile.patch | 72 -- meta/packages/gmp/gmp-4.1.4/configure.patch | 837 -------------------- .../gmp/{gmp-4.1.4 => gmp-4.2.1}/amd64.patch | 0 meta/packages/gmp/gmp-4.2.1/configure.patch | 195 +++++ .../gmp/{gmp-4.1.4 => gmp-4.2.1}/sh4-asmfix.patch | 0 meta/packages/gmp/gmp-native.inc | 23 + meta/packages/gmp/gmp-native_4.1.2.bb | 7 - meta/packages/gmp/gmp-native_4.2.1.bb | 2 + meta/packages/gmp/{gmp_4.1.4.bb => gmp.inc} | 5 +- meta/packages/gmp/gmp_4.1.2.bb | 18 - meta/packages/gmp/gmp_4.2.1.bb | 3 + 13 files changed, 224 insertions(+), 1818 deletions(-) delete mode 100644 meta/packages/gmp/gmp-4.1.2/amd64.patch delete mode 100644 meta/packages/gmp/gmp-4.1.2/configure.patch delete mode 100644 meta/packages/gmp/gmp-4.1.2/gcc-compile.patch delete mode 100644 meta/packages/gmp/gmp-4.1.4/configure.patch rename meta/packages/gmp/{gmp-4.1.4 => gmp-4.2.1}/amd64.patch (100%) create mode 100644 meta/packages/gmp/gmp-4.2.1/configure.patch rename meta/packages/gmp/{gmp-4.1.4 => gmp-4.2.1}/sh4-asmfix.patch (100%) create mode 100644 meta/packages/gmp/gmp-native.inc delete mode 100644 meta/packages/gmp/gmp-native_4.1.2.bb create mode 100644 meta/packages/gmp/gmp-native_4.2.1.bb rename meta/packages/gmp/{gmp_4.1.4.bb => gmp.inc} (78%) delete mode 100644 meta/packages/gmp/gmp_4.1.2.bb create mode 100644 meta/packages/gmp/gmp_4.2.1.bb diff --git a/meta/packages/gmp/gmp-4.1.2/amd64.patch b/meta/packages/gmp/gmp-4.1.2/amd64.patch deleted file mode 100644 index bbede7f..0000000 --- a/meta/packages/gmp/gmp-4.1.2/amd64.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gmp-4.1.2/longlong.h -=================================================================== ---- gmp-4.1.2.orig/longlong.h 2005-06-24 13:38:06.787570452 -0700 -+++ gmp-4.1.2/longlong.h 2005-06-24 13:38:31.539556496 -0700 -@@ -715,8 +715,10 @@ - } while (0) - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%0" : "=r" (count) : "rm" ((UDItype)(x))); \ -+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ -+ (count) = __cbtmp; \ - } while (0) - #endif /* x86_64 */ - diff --git a/meta/packages/gmp/gmp-4.1.2/configure.patch b/meta/packages/gmp/gmp-4.1.2/configure.patch deleted file mode 100644 index 94ad97e..0000000 --- a/meta/packages/gmp/gmp-4.1.2/configure.patch +++ /dev/null @@ -1,864 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gmp-4.1.2/mpfr/Makefile.am~configure 2002-05-15 20:27:52.000000000 -0400 -+++ gmp-4.1.2/mpfr/Makefile.am 2004-01-25 12:53:19.000000000 -0500 -@@ -28,7 +28,7 @@ - SUBDIRS = tests - - INCLUDES = -I$(top_srcdir) --CFLAGS = @MPFR_CFLAGS@ -+AM_CFLAGS = @MPFR_CFLAGS@ - LIBS = @MPFR_LIBS@ - - if WANT_MPFR ---- gmp-4.1.2/mpfr/tests/Makefile.am~configure 2002-11-24 17:00:42.000000000 -0500 -+++ gmp-4.1.2/mpfr/tests/Makefile.am 2004-01-25 12:53:19.000000000 -0500 -@@ -22,7 +22,7 @@ - AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr - - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mpfr --CFLAGS = @MPFR_CFLAGS@ -+AM_CFLAGS = @MPFR_CFLAGS@ - LIBS = @MPFR_LIBS@ - - LDADD = ../libmpfr.a $(top_builddir)/libgmp.la ---- gmp-4.1.2/configure.in~configure 2002-12-23 15:52:09.000000000 -0500 -+++ gmp-4.1.2/configure.in 2004-01-25 12:53:19.000000000 -0500 -@@ -26,15 +26,16 @@ - - - AC_REVISION($Revision: 1.425.2.17 $) --AC_PREREQ(2.52) --AC_INIT(gmp-impl.h) --m4_pattern_forbid([^[ \t]*GMP_]) --m4_pattern_forbid([^[ \t]*MPFR_CONFIGS]) --m4_pattern_allow(GMP_LDFLAGS) --m4_pattern_allow(GMP_LIMB_BITS) --m4_pattern_allow(GMP_MPARAM_H_SUGGEST) --m4_pattern_allow(GMP_NAIL_BITS) --m4_pattern_allow(GMP_NUMB_BITS) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([gmp-impl.h]) -+ -+ -+ -+ -+ -+ -+ - - # If --target is not used then $target_alias is empty, but if say - # "./configure athlon-pc-freebsd3.5" is used, then all three of -@@ -56,7 +57,7 @@ - GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')", POST) - - AM_INIT_AUTOMAKE(gmp, GMP_VERSION) --AM_CONFIG_HEADER(config.h:config.in) -+AC_CONFIG_HEADERS([config.h:config.in]) - AM_MAINTAINER_MODE - - -@@ -201,7 +202,7 @@ - # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is - # called. User selections of CC etc are respected. - # --# Care is taken not to use macros like AC_TRY_COMPILE during the GMP -+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP - # pre-testing, since they of course depend on AC_PROG_CC, and also some of - # them cache their results, which is not wanted. - # -@@ -288,7 +289,7 @@ - # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring - # c89 over cc here. But note that on HP-UX c89 provides a castrated - # environment, and would want to be excluded somehow. Maybe --# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and -+# already does enough to stick cc into ANSI mode and - # we don't need to worry. - # - cclist="gcc cc" -@@ -1010,7 +1011,7 @@ - CFLAGS_or_unset=${CFLAGS-'(unset)'} - CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} - --cat >&AC_FD_CC <&AS_MESSAGE_LOG_FD() <&AC_FD_CC -+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() - cxxflags_ac_prog_cxx=$CXXFLAGS - cxxflags_list=ac_prog_cxx - -@@ -1409,7 +1410,7 @@ - fi - - --cat >&AC_FD_CC <&AS_MESSAGE_LOG_FD() </dev/null]), - [^.*$1[ ]+],[]), -@@ -86,7 +86,7 @@ - dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits - dnl like 3.0.1 if patchlevel > 0. - --define(GMP_VERSION, -+define([GMP_VERSION], - [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl - .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl - ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1, -@@ -97,13 +97,13 @@ - dnl ------------------------------ - dnl Setup an AC_SUBST of HAVE_FUNC_01 for each argument. - --AC_DEFUN(GMP_SUBST_CHECK_FUNCS, -+AC_DEFUN([GMP_SUBST_CHECK_FUNCS], - [m4_if([$1],,, - [_GMP_SUBST_CHECK_FUNCS(ac_cv_func_[$1],HAVE_[]m4_translit([$1],[a-z],[A-Z])_01) - GMP_SUBST_CHECK_FUNCS(m4_shift($@))])]) - - dnl Called: _GMP_SUBST_CHECK_FUNCS(cachvar,substvar) --AC_DEFUN(_GMP_SUBST_CHECK_FUNCS, -+AC_DEFUN([_GMP_SUBST_CHECK_FUNCS], - [case $[$1] in - yes) AC_SUBST([$2],1) ;; - no) [$2]=0 ;; -@@ -115,14 +115,14 @@ - dnl ---------------------------------- - dnl Setup an AC_SUBST of HAVE_FOO_H_01 for each argument. - --AC_DEFUN(GMP_SUBST_CHECK_HEADERS, -+AC_DEFUN([GMP_SUBST_CHECK_HEADERS], - [m4_if([$1],,, - [_GMP_SUBST_CHECK_HEADERS(ac_cv_header_[]m4_translit([$1],[./],[__]), - HAVE_[]m4_translit([$1],[a-z./],[A-Z__])_01) - GMP_SUBST_CHECK_HEADERS(m4_shift($@))])]) - - dnl Called: _GMP_SUBST_CHECK_HEADERS(cachvar,substvar) --AC_DEFUN(_GMP_SUBST_CHECK_HEADERS, -+AC_DEFUN([_GMP_SUBST_CHECK_HEADERS], - [case $[$1] in - yes) AC_SUBST([$2],1) ;; - no) [$2]=0 ;; -@@ -145,12 +145,12 @@ - dnl would test whether $major.$minor.$subminor is greater than or equal to - dnl 10.3.1. - --AC_DEFUN(GMP_COMPARE_GE, -+AC_DEFUN([GMP_COMPARE_GE], - [gmp_compare_ge=no - GMP_COMPARE_GE_INTERNAL($@) - ]) - --AC_DEFUN(GMP_COMPARE_GE_INTERNAL, -+AC_DEFUN([GMP_COMPARE_GE_INTERNAL], - [ifelse(len([$3]),0, - [if test -n "$1" && test "$1" -ge $2; then - gmp_compare_ge=yes -@@ -184,7 +184,7 @@ - dnl for instance to random.o (and others) on vax-dec-ultrix4.5. Naturally - dnl a user-selected $AR_FLAGS is left unchanged. - --AC_DEFUN(GMP_PROG_AR, -+AC_DEFUN([GMP_PROG_AR], - [dnl Want to establish $AR before libtool initialization. - AC_BEFORE([$0],[AC_PROG_LIBTOOL]) - gmp_user_AR=$AR -@@ -212,7 +212,7 @@ - dnl CC_FOR_BUILD is used without testing. CC_FOR_BUILD is the new name for - dnl a build system compiler, see configfsf.guess. - --AC_DEFUN(GMP_PROG_HOST_CC, -+AC_DEFUN([GMP_PROG_HOST_CC], - [AC_BEFORE([$0],[AC_PROG_LIBTOOL]) - AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([for HOST_CC build system compiler], -@@ -255,7 +255,7 @@ - dnl FIXME: This can be removed and just AM_PROG_LEX used, one that macro - dnl works properly. - --AC_DEFUN(GMP_PROG_LEX, -+AC_DEFUN([GMP_PROG_LEX], - [AC_REQUIRE([AC_PROG_LEX]) - if test "$LEX" = :; then - LEX=${am_missing_run}flex -@@ -273,7 +273,7 @@ - dnl - dnl See mpn/asm-defs.m4 for details on the known bad m4s. - --AC_DEFUN(GMP_PROG_M4, -+AC_DEFUN([GMP_PROG_M4], - [AC_ARG_VAR(M4,[m4 macro processor]) - AC_CACHE_CHECK([for suitable m4], - gmp_cv_prog_m4, -@@ -340,7 +340,7 @@ - dnl Enhancement: Maybe this could be in GMP_PROG_M4, and attempt to prefer - dnl an m4 with a working m4wrap, if it can be found. - --AC_DEFUN(GMP_M4_M4WRAP_SPURIOUS, -+AC_DEFUN([GMP_M4_M4WRAP_SPURIOUS], - [AC_REQUIRE([GMP_PROG_M4]) - AC_CACHE_CHECK([if m4wrap produces spurious output], - gmp_cv_m4_m4wrap_spurious, -@@ -374,7 +374,7 @@ - dnl A user-selected $NM is always left unchanged. AC_PROG_NM is still run - dnl to get the "checking" message printed though. - --AC_DEFUN(GMP_PROG_NM, -+AC_DEFUN([GMP_PROG_NM], - [dnl Make sure we're the first to call AC_PROG_NM, so our extra flags are - dnl used by everyone. - AC_BEFORE([$0],[AC_PROG_NM]) -@@ -426,7 +426,7 @@ - dnl will run is that a plain native "./configure" falls back on ABI=32, but - dnl ABI=64 is still available as a cross-compile. - --AC_DEFUN(GMP_PROG_CC_WORKS, -+AC_DEFUN([GMP_PROG_CC_WORKS], - [AC_MSG_CHECKING([compiler $1]) - cat >conftest.c <conftest.c <