tools/gmp/patches/000-OE-configure.patch

   1 diff -rdup gmp-5.0.1.oorig/acinclude.m4 gmp-5.0.1/acinclude.m4
   2 --- gmp-5.0.1.oorig/acinclude.m4        2010-02-06 13:43:13.000000000 +0100
   3 +++ gmp-5.0.1/acinclude.m4      2010-02-08 17:19:44.000000000 +0100
   4 @@ -30,23 +30,23 @@ dnl    a_out.exe - OpenVMS DEC C called
   5  dnl    conftest.exe - various DOS compilers
   6
   7
   8 -define(IA64_PATTERN,
   9 +define([IA64_PATTERN],
  10  [[ia64*-*-* | itanium-*-* | itanium2-*-*]])
  11
  12  dnl  Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
  13  dnl  of which config.sub accepts.  (Though none of which are likely to work
  14  dnl  with GMP.)
  15  dnl
  16 -define(M68K_PATTERN,
  17 +define([M68K_PATTERN],
  18  [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
  19
  20 -define(POWERPC64_PATTERN,
  21 +define([POWERPC64_PATTERN],
  22  [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
  23
  24 -define(X86_PATTERN,
  25 +define([X86_PATTERN],
  26  [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
  27
  28 -define(X86_64_PATTERN,
  29 +define([X86_64_PATTERN],
  30  [[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei-*-* | x86_64-*-* | nano-*-*]])
  31
  32  dnl  GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
  33 @@ -64,7 +64,7 @@ dnl      x86         ->  x86
  34  dnl      x86/k6      ->  k6
  35  dnl      x86/k6/mmx  ->  k6_mmx
  36
  37 -define(GMP_FAT_SUFFIX,
  38 +define([GMP_FAT_SUFFIX],
  39  [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
  40
  41
  42 @@ -73,7 +73,7 @@ dnl  ----------------------------------
  43  dnl  Emit code to remove any occurrence of ITEM from $LISTVAR.  ITEM can be a
  44  dnl  shell expression like $foo if desired.
  45
  46 -define(GMP_REMOVE_FROM_LIST,
  47 +define([GMP_REMOVE_FROM_LIST],
  48  [remove_from_list_tmp=
  49  for remove_from_list_i in $[][$1]; do
  50    if test $remove_from_list_i = [$2]; then :;
  51 @@ -89,12 +89,12 @@ dnl  GMP_STRIP_PATH(subdir)
  52  dnl  ----------------------
  53  dnl  Strip entries */subdir from $path and $fat_path.
  54
  55 -define(GMP_STRIP_PATH,
  56 +define([GMP_STRIP_PATH],
  57  [GMP_STRIP_PATH_VAR(path, [$1])
  58  GMP_STRIP_PATH_VAR(fat_path, [$1])
  59  ])
  60
  61 -define(GMP_STRIP_PATH_VAR,
  62 +define([GMP_STRIP_PATH_VAR],
  63  [tmp_path=
  64  for i in $[][$1]; do
  65    case $i in
  66 @@ -115,7 +115,7 @@ dnl
  67  dnl  Dummy value for GMP_LIMB_BITS is enough
  68  dnl  for all current configure-time uses of gmp.h.
  69
  70 -define(GMP_INCLUDE_GMP_H,
  71 +define([GMP_INCLUDE_GMP_H],
  72  [[#define __GMP_WITHIN_CONFIGURE 1   /* ignore template stuff */
  73  #define GMP_NAIL_BITS $GMP_NAIL_BITS
  74  #define GMP_LIMB_BITS 123
  75 @@ -130,7 +130,7 @@ dnl  Expand at autoconf time to the valu
  76  dnl  FILE.  The regexps here aren't very rugged, but are enough for gmp.
  77  dnl  /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
  78
  79 -define(GMP_HEADER_GETVAL,
  80 +define([GMP_HEADER_GETVAL],
  81  [patsubst(patsubst(
  82  esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
  83  [^.*$1[        ]+],[]),
  84 @@ -144,7 +144,7 @@ dnl  The gmp version number, extracted f
  85  dnl  autoconf time.  Two digits like 3.0 if patchlevel <= 0, or three digits
  86  dnl  like 3.0.1 if patchlevel > 0.
  87
  88 -define(GMP_VERSION,
  89 +define([GMP_VERSION],
  90  [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
  91  .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
  92  .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
  93 @@ -1506,7 +1506,9 @@ esac
  94  echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
  95
  96  # All CPUs use asm-defs.m4
  97 -echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
  98 +echo -n ["include("] >>$gmp_tmpconfigm4i
  99 +echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
 100 +echo [")"] >>$gmp_tmpconfigm4i
 101  ])
 102
 103
 104 diff -rdup gmp-5.0.1.oorig/configure.in gmp-5.0.1/configure.in
 105 --- gmp-5.0.1.oorig/configure.in        2010-02-06 13:43:13.000000000 +0100
 106 +++ gmp-5.0.1/configure.in      2010-02-08 17:18:30.000000000 +0100
 107 @@ -29,12 +29,6 @@ AC_REVISION($Revision$)
 108  AC_PREREQ(2.59)
 109  AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@gmplib.org, gmp)
 110  AC_CONFIG_SRCDIR(gmp-impl.h)
 111 -m4_pattern_forbid([^[ \t]*GMP_])
 112 -m4_pattern_allow(GMP_LDFLAGS)
 113 -m4_pattern_allow(GMP_LIMB_BITS)
 114 -m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
 115 -m4_pattern_allow(GMP_NAIL_BITS)
 116 -m4_pattern_allow(GMP_NUMB_BITS)
 117
 118  # If --target is not used then $target_alias is empty, but if say
 119  # "./configure athlon-pc-freebsd3.5" is used, then all three of
 120 @@ -303,7 +297,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
 121  # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
 122  # called.  User selections of CC etc are respected.
 123  #
 124 -# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
 125 +# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
 126  # pre-testing, since they of course depend on AC_PROG_CC, and also some of
 127  # them cache their results, which is not wanted.
 128  #
 129 @@ -395,7 +389,7 @@ abilist="standard"
 130  # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
 131  # c89 over cc here.  But note that on HP-UX c89 provides a castrated
 132  # environment, and would want to be excluded somehow.  Maybe
 133 -# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
 134 +#  already does enough to stick cc into ANSI mode and
 135  # we don't need to worry.
 136  #
 137  cclist="gcc cc"
 138 @@ -1580,7 +1574,7 @@ esac
 139  CFLAGS_or_unset=${CFLAGS-'(unset)'}
 140  CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
 141
 142 -cat >&AC_FD_CC <<EOF
 143 +cat >&AS_MESSAGE_LOG_FD() <<EOF
 144  User:
 145  ABI=$ABI
 146  CC=$CC
 147 @@ -1987,7 +1981,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
 148
 149  # The C compiler and preprocessor, put into ANSI mode if possible.
 150  AC_PROG_CC
 151 -AC_PROG_CC_STDC
 152  AC_PROG_CPP
 153  GMP_H_ANSI
 154
 155 @@ -2010,11 +2003,11 @@ AC_SUBST(CCAS)
 156
 157  # The C++ compiler, if desired.
 158  want_cxx=no
 159 +AC_PROG_CXX
 160  if test $enable_cxx != no; then
 161    test_CXXFLAGS=${CXXFLAGS+set}
 162 -  AC_PROG_CXX
 163
 164 -  echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
 165 +  echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
 166    cxxflags_ac_prog_cxx=$CXXFLAGS
 167    cxxflags_list=ac_prog_cxx
 168
 169 @@ -2120,7 +2113,7 @@ case $host in
 170  esac
 171
 172
 173 -cat >&AC_FD_CC <<EOF
 174 +cat >&AS_MESSAGE_LOG_FD() <<EOF
 175  Decided:
 176  ABI=$ABI
 177  CC=$CC
 178 @@ -3376,7 +3369,7 @@ GMP_FINISH
 179  # FIXME: Upcoming version of autoconf/automake may not like broken lines.
 180  #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
 181
 182 -AC_OUTPUT(Makefile                                                     \
 183 +AC_CONFIG_FILES([Makefile                                                      \
 184    mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile                        \
 185    mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile             \
 186    tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile             \
 187 @@ -3385,4 +3378,5 @@ AC_OUTPUT(Makefile                                                        \
 188    tests/cxx/Makefile                                                   \
 189    doc/Makefile tune/Makefile                                           \
 190    demos/Makefile demos/calc/Makefile demos/expr/Makefile               \
 191 -  gmp.h:gmp-h.in mp.h:mp-h.in)
 192 +  gmp.h:gmp-h.in mp.h:mp-h.in])
 193 +AC_OUTPUT