From f92ce155a282d76560af387b2fe72e096b6ea73f Mon Sep 17 00:00:00 2001
From: Thomas Kahle <tomka@gentoo.org>
Date: Fri, 12 Nov 2010 13:15:46 +0000
Subject: New package: sci-libs/mpir, imported from science overlay, fixes bug
 293383. Thanks to science team and users for ebuild work.

(Portage version: 2.1.9.24/cvs/Linux i686)
---
 sci-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch | 145 ++++++++++++++++++++++
 sci-libs/mpir/files/mpir-2.0.0-yasm.patch         |  51 ++++++++
 2 files changed, 196 insertions(+)
 create mode 100644 sci-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch
 create mode 100644 sci-libs/mpir/files/mpir-2.0.0-yasm.patch

(limited to 'sci-libs/mpir/files')

diff --git a/sci-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch b/sci-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch
new file mode 100644
index 000000000000..fba6fea2e8f6
--- /dev/null
+++ b/sci-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch
@@ -0,0 +1,145 @@
+--- configure.in.orig	2009-11-28 10:48:59.196977657 +0000
++++ configure.in	2009-11-28 10:54:50.717976971 +0000
+@@ -361,7 +361,7 @@
+ # hugely bloat the output.
+ 
+ 
+-AC_ARG_VAR(ABI, [desired ABI (for processors supporting more than one ABI)])
++AC_ARG_VAR(MPIRABI, [desired ABI (for processors supporting more than one ABI)])
+ 
+ # abilist needs to be non-empty, "standard" is just a generic name here
+ abilist="standard"
+@@ -1590,7 +1590,7 @@
+ 
+ cat >&AC_FD_CC <<EOF
+ User:
+-ABI=$ABI
++MPIRABI=$MPIRABI
+ CC=$CC
+ CFLAGS=$CFLAGS_or_unset
+ CPPFLAGS=$CPPFLAGS_or_unset
+@@ -1611,22 +1611,22 @@
+ # If the user specifies an ABI then it must be in $abilist, after that
+ # $abilist is restricted to just that choice.
+ #
+-if test -n "$ABI"; then
++if test -n "$MPIRABI"; then
+   found=no
+   for abi in $abilist; do
+-    if test $abi = "$ABI"; then found=yes; break; fi
++    if test $abi = "$MPIRABI"; then found=yes; break; fi
+   done
+   if test $found = no; then
+-    AC_MSG_ERROR([ABI=$ABI is not among the following valid choices: $abilist])
++    AC_MSG_ERROR([MPIRABI=$MPIRABI is not among the following valid choices: $abilist])
+   fi
+-  abilist="$ABI"
++  abilist="$MPIRABI"
+ fi
+ 
+ found_compiler=no
+ 
+ for abi in $abilist; do
+ 
+-  echo "checking ABI=$abi"
++  echo "checking MPIRABI=$abi"
+ 
+   # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and
+   # abi2="_64".  For abi=32, will have abi1="_32" and abi2="".  This is how
+@@ -1879,7 +1879,7 @@
+     done
+   fi
+ 
+-  ABI="$abi"
++  MPIRABI="$abi"
+   CC="$cc"
+   CFLAGS="$cflags"
+   CPPFLAGS="$cppflags"
+@@ -1895,8 +1895,8 @@
+    AC_SUBST(GMP_CFLAGS)
+ 
+   # Could easily have this in config.h too, if desired.
+-  ABI_nodots=`echo $ABI | sed 's/\./_/'`
+-  GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')", POST)
++  ABI_nodots=`echo $MPIRABI | sed 's/\./_/'`
++  GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$MPIRABI_nodots')", POST)
+ 
+ 
+   # GMP_LDFLAGS substitution, selected according to ABI.
+@@ -2094,7 +2094,7 @@
+ #
+ case $host in
+   X86_PATTERN | X86_64_PATTERN)
+-    if test "$ABI" = 32; then
++    if test "$MPIRABI" = 32; then
+       case "$path $fat_path" in
+         *mmx*)   GMP_ASM_X86_MMX( , [GMP_STRIP_PATH(*mmx*)]) ;;
+       esac
+@@ -2108,7 +2108,7 @@
+ 
+ cat >&AC_FD_CC <<EOF
+ Decided:
+-ABI=$ABI
++MPIRABI=$MPIRABI
+ CC=$CC
+ CFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
+@@ -2117,7 +2117,7 @@
+ CXXFLAGS=$CXXFLAGS
+ path=$path
+ EOF
+-echo "using ABI=\"$ABI\""
++echo "using MPIRABI=\"$MPIRABI\""
+ echo "      CC=\"$CC\""
+ echo "      CFLAGS=\"$CFLAGS\""
+ echo "      CPPFLAGS=\"$CPPFLAGS\""
+@@ -2593,7 +2593,7 @@
+ 
+ 
+ if test -n "$fat_path"; then
+-  if test "$ABI" = 64; then
++  if test "$MPIRABI" = 64; then
+     fat_path="$fat_path_64"
+   fi
+ 
+@@ -3099,19 +3099,19 @@
+       GMP_INCLUDE_MPN(powerpc32/powerpc-defs.m4)
+       case $host in
+         *-*-aix*)
+-	  case $ABI in
++	  case $MPIRABI in
+ 	    64 | aix64)  GMP_INCLUDE_MPN(powerpc64/aix.m4) ;;
+             *)           GMP_INCLUDE_MPN(powerpc32/aix.m4) ;;
+           esac
+           ;;
+         *-*-linux* | *-*-*bsd*)
+-	  case $ABI in
++	  case $MPIRABI in
+ 	    mode64)      GMP_INCLUDE_MPN(powerpc64/elf.m4) ;;
+ 	    mode32 | 32) GMP_INCLUDE_MPN(powerpc32/elf.m4) ;;
+           esac
+           ;;
+         *-*-darwin*)
+-	  case $ABI in
++	  case $MPIRABI in
+ 	    mode64)      GMP_INCLUDE_MPN(powerpc64/darwin.m4) ;;
+ 	    mode32 | 32) GMP_INCLUDE_MPN(powerpc32/darwin.m4) ;;
+           esac
+@@ -3126,7 +3126,7 @@
+       GMP_INCLUDE_MPN(powerpc32/aix.m4)
+       ;;
+     sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
+-      case $ABI in
++      case $MPIRABI in
+         64)
+           GMP_ASM_SPARC_REGISTER
+           ;;
+@@ -3134,7 +3134,7 @@
+       ;;
+     X86_PATTERN | X86_64_PATTERN)
+       GMP_ASM_ALIGN_FILL_0x90
+-      case $ABI in
++      case $MPIRABI in
+         32)
+           GMP_INCLUDE_MPN(x86/x86-defs.m4)
+           AC_DEFINE(HAVE_HOST_CPU_FAMILY_x86)
diff --git a/sci-libs/mpir/files/mpir-2.0.0-yasm.patch b/sci-libs/mpir/files/mpir-2.0.0-yasm.patch
new file mode 100644
index 000000000000..156851bae97e
--- /dev/null
+++ b/sci-libs/mpir/files/mpir-2.0.0-yasm.patch
@@ -0,0 +1,51 @@
+--- configure.in.orig	2010-05-20 22:50:45.883576257 +1200
++++ configure.in	2010-05-20 22:51:52.405575089 +1200
+@@ -1596,8 +1596,6 @@
+     ;;
+ esac
+ 
+-AM_CONDITIONAL(BUILD_YASM, test "$want_yasm" = "yes")
+-
+ CFLAGS_or_unset=${CFLAGS-'(unset)'}
+ CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
+ 
+@@ -1995,7 +1993,7 @@
+ GMP_CHECK_LIBM_FOR_BUILD
+ 
+ 
+-MPIR_AS="/yasm/yasm"
++MPIR_AS="yasm"
+ 
+ # How to assemble, used with CFLAGS etc, see mpn/Makeasm.am.
+ # Using the compiler is a lot easier than figuring out how to invoke the
+@@ -3373,9 +3371,6 @@
+ # FIXME: Upcoming version of autoconf/automake don't like broken lines.
+ #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
+ 
+-#     allways configure all subdirectorys , even if there are not going to be built , 
+-AC_CONFIG_SUBDIRS([yasm])
+-
+ if test $enable_fat = yes; then
+ YASM_MAC_INC=yasm_mac.inc.fat
+ else
+--- mpn/Makeasm.am.orig	2010-05-20 22:52:23.080577062 +1200
++++ mpn/Makeasm.am	2010-05-20 22:53:17.802576960 +1200
+@@ -111,4 +111,4 @@
+ #  .as assembler, assembled with Yasm
+ 
+ .as.lo:
+-	$(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(top_builddir)$(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++	$(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+--- Makefile.am.orig	2010-05-20 22:57:02.288576440 +1200
++++ Makefile.am	2010-05-20 22:57:14.616576831 +1200
+@@ -93,10 +93,6 @@
+ 
+ SUBDIRS = tests
+ 
+-if BUILD_YASM
+-SUBDIRS += yasm
+-endif
+-
+ SUBDIRS += mpn mpz mpq mpf printf scanf cxx demos tune doc
+ 
+ EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
-- 
cgit v1.2.3-65-gdbad