From e2182c5b04c8cb4479f921bb7e204c8f2fcb0ae9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 31 Jul 2009 12:03:58 +0100 Subject: gmp: 4.2.2 -> 4.2.4 (parts from OE.dev) Signed-off-by: Richard Purdie --- meta/packages/gmp/gmp-4.2.2/amd64.patch | 14 -- meta/packages/gmp/gmp-4.2.2/configure.patch | 195 ----------------------- meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch | 26 --- meta/packages/gmp/gmp-4.2.4/amd64.patch | 14 ++ meta/packages/gmp/gmp-4.2.4/configure.patch | 195 +++++++++++++++++++++++ meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch | 26 +++ meta/packages/gmp/gmp-4.2.4/use-includedir.patch | 13 ++ meta/packages/gmp/gmp-native_4.2.2.bb | 2 - meta/packages/gmp/gmp-native_4.2.4.bb | 3 + meta/packages/gmp/gmp-sdk_4.2.2.bb | 2 - meta/packages/gmp/gmp-sdk_4.2.4.bb | 2 + meta/packages/gmp/gmp_4.2.2.bb | 3 - meta/packages/gmp/gmp_4.2.4.bb | 7 + 13 files changed, 260 insertions(+), 242 deletions(-) delete mode 100644 meta/packages/gmp/gmp-4.2.2/amd64.patch delete mode 100644 meta/packages/gmp/gmp-4.2.2/configure.patch delete mode 100644 meta/packages/gmp/gmp-4.2.2/sh4-asmfix.patch create mode 100644 meta/packages/gmp/gmp-4.2.4/amd64.patch create mode 100644 meta/packages/gmp/gmp-4.2.4/configure.patch create mode 100644 meta/packages/gmp/gmp-4.2.4/sh4-asmfix.patch create mode 100644 meta/packages/gmp/gmp-4.2.4/use-includedir.patch delete mode 100644 meta/packages/gmp/gmp-native_4.2.2.bb create mode 100644 meta/packages/gmp/gmp-native_4.2.4.bb delete mode 100644 meta/packages/gmp/gmp-sdk_4.2.2.bb create mode 100644 meta/packages/gmp/gmp-sdk_4.2.4.bb delete mode 100644 meta/packages/gmp/gmp_4.2.2.bb create mode 100644 meta/packages/gmp/gmp_4.2.4.bb (limited to 'meta/packages') diff --git a/meta/packages/gmp/gmp-4.2.2/amd64.patch b/meta/packages/gmp/gmp-4.2.2/amd64.patch deleted file mode 100644 index 67be9dd35..000000000 --- a/meta/packages/gmp/gmp-4.2.2/amd64.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200 -+++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200 -@@ -738,8 +738,10 @@ - count is only an int. */ - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%q0" : "=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.2.2/configure.patch b/meta/packages/gmp/gmp-4.2.2/configure.patch deleted file mode 100644 index b563bd058..000000000 --- a/meta/packages/gmp/gmp-4.2.2/configure.patch +++ /dev/null @@ -1,195 +0,0 @@ - acinclude.m4 | 26 ++++++++++++++------------ - configure.in | 24 +++++++++--------------- - 2 files changed, 23 insertions(+), 27 deletions(-) - -Index: gmp-4.2.2/acinclude.m4 -=================================================================== ---- gmp-4.2.2.orig/acinclude.m4 2007-09-01 11:09:03.000000000 +0100 -+++ gmp-4.2.2/acinclude.m4 2008-04-30 17:19:16.000000000 +0100 -@@ -30,20 +30,20 @@ - dnl conftest.exe - various DOS compilers - - --define(IA64_PATTERN, -+define([IA64_PATTERN], - [[ia64*-*-* | itanium-*-* | itanium2-*-*]]) - - dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all - dnl of which config.sub accepts. (Though none of which are likely to work - dnl with GMP.) - dnl --define(M68K_PATTERN, -+define([M68K_PATTERN], - [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]]) - --define(POWERPC64_PATTERN, -+define([POWERPC64_PATTERN], - [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]]) - --define(X86_PATTERN, -+define([X86_PATTERN], - [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]]) - - -@@ -62,7 +62,7 @@ - dnl x86/k6 -> k6 - dnl x86/k6/mmx -> k6_mmx - --define(GMP_FAT_SUFFIX, -+define([GMP_FAT_SUFFIX], - [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) - - -@@ -71,7 +71,7 @@ - dnl Emit code to remove any occurance of ITEM from $LISTVAR. ITEM can be a - dnl shell expression like $foo if desired. - --define(GMP_REMOVE_FROM_LIST, -+define([GMP_REMOVE_FROM_LIST], - [remove_from_list_tmp= - for remove_from_list_i in $[][$1]; do - if test $remove_from_list_i = [$2]; then :; -@@ -87,12 +87,12 @@ - dnl ---------------------- - dnl Strip entries subdir from $path and $fat_path. - --define(GMP_STRIP_PATH, -+define([GMP_STRIP_PATH], - [GMP_STRIP_PATH_VAR(path, [$1]) - GMP_STRIP_PATH_VAR(fat_path, [$1]) - ]) - --define(GMP_STRIP_PATH_VAR, -+define([GMP_STRIP_PATH_VAR], - [tmp_path= - for i in $[][$1]; do - case $i in -@@ -113,7 +113,7 @@ - dnl Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough - dnl for all current configure-time uses of gmp.h. - --define(GMP_INCLUDE_GMP_H, -+define([GMP_INCLUDE_GMP_H], - [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ - #define GMP_NAIL_BITS $GMP_NAIL_BITS - #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */ -@@ -129,7 +129,7 @@ - dnl FILE. The regexps here aren't very rugged, but are enough for gmp. - dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. - --define(GMP_HEADER_GETVAL, -+define([GMP_HEADER_GETVAL], - [patsubst(patsubst( - esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), - [^.*$1[ ]+],[]), -@@ -143,7 +143,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, -@@ -1489,7 +1489,9 @@ - echo ["define(,<\`$tmp'>)"] >>$gmp_tmpconfigm4 - - # All CPUs use asm-defs.m4 --echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i -+echo -n ["include("] >>$gmp_tmpconfigm4i -+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i -+echo [")"] >>$gmp_tmpconfigm4i - ]) - - -Index: gmp-4.2.2/configure.in -=================================================================== ---- gmp-4.2.2.orig/configure.in 2007-09-09 17:39:14.000000000 +0100 -+++ gmp-4.2.2/configure.in 2008-04-30 17:09:10.000000000 +0100 -@@ -29,12 +29,6 @@ - AC_PREREQ(2.59) - AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp) - AC_CONFIG_SRCDIR(gmp-impl.h) --m4_pattern_forbid([^[ \t]*GMP_]) --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) - - # If --target is not used then $target_alias is empty, but if say - # "./configure athlon-pc-freebsd3.5" is used, then all three of -@@ -275,7 +269,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. - # -@@ -367,7 +361,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" -@@ -1518,7 +1512,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 - -@@ -2022,7 +2015,7 @@ - esac - - --cat >&AC_FD_CC <&AS_MESSAGE_LOG_FD() < k6 + dnl x86/k6/mmx -> k6_mmx + +-define(GMP_FAT_SUFFIX, ++define([GMP_FAT_SUFFIX], + [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) + + +@@ -71,7 +71,7 @@ + dnl Emit code to remove any occurance of ITEM from $LISTVAR. ITEM can be a + dnl shell expression like $foo if desired. + +-define(GMP_REMOVE_FROM_LIST, ++define([GMP_REMOVE_FROM_LIST], + [remove_from_list_tmp= + for remove_from_list_i in $[][$1]; do + if test $remove_from_list_i = [$2]; then :; +@@ -87,12 +87,12 @@ + dnl ---------------------- + dnl Strip entries */subdir from $path and $fat_path. + +-define(GMP_STRIP_PATH, ++define([GMP_STRIP_PATH], + [GMP_STRIP_PATH_VAR(path, [$1]) + GMP_STRIP_PATH_VAR(fat_path, [$1]) + ]) + +-define(GMP_STRIP_PATH_VAR, ++define([GMP_STRIP_PATH_VAR], + [tmp_path= + for i in $[][$1]; do + case $i in +@@ -113,7 +113,7 @@ + dnl Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough + dnl for all current configure-time uses of gmp.h. + +-define(GMP_INCLUDE_GMP_H, ++define([GMP_INCLUDE_GMP_H], + [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS + #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */ +@@ -129,7 +129,7 @@ + dnl FILE. The regexps here aren't very rugged, but are enough for gmp. + dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. + +-define(GMP_HEADER_GETVAL, ++define([GMP_HEADER_GETVAL], + [patsubst(patsubst( + esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), + [^.*$1[ ]+],[]), +@@ -143,7 +143,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, +@@ -1506,7 +1506,9 @@ + echo ["define(,<\`$tmp'>)"] >>$gmp_tmpconfigm4 + + # All CPUs use asm-defs.m4 +-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i ++echo -n ["include("] >>$gmp_tmpconfigm4i ++echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i ++echo [")"] >>$gmp_tmpconfigm4i + ]) + + +Index: gmp-4.2.4/configure.in +=================================================================== +--- gmp-4.2.4.orig/configure.in 2008-08-01 19:24:04.000000000 +0200 ++++ gmp-4.2.4/configure.in 2008-10-15 23:35:03.466325346 +0200 +@@ -29,12 +29,6 @@ + AC_PREREQ(2.59) + AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp) + AC_CONFIG_SRCDIR(gmp-impl.h) +-m4_pattern_forbid([^[ \t]*GMP_]) +-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) + + # If --target is not used then $target_alias is empty, but if say + # "./configure athlon-pc-freebsd3.5" is used, then all three of +@@ -278,7 +272,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. + # +@@ -370,7 +364,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" +@@ -1525,7 +1519,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 + +@@ -2029,7 +2022,7 @@ + esac + + +-cat >&AC_FD_CC <&AS_MESSAGE_LOG_FD() <