17899122 Upgrade GNU MP to 6.1.2
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Thu, 30 Mar 2017 08:44:01 -0700
changeset 7812 ffe9ca8c9421
parent 7810 89b7621146f8
child 7813 d18938ebcb0d
17899122 Upgrade GNU MP to 6.1.2 22234498 GNU MP should be built with GCC
components/gawk/Makefile
components/gcc4/Makefile
components/gcc5/Makefile
components/gnump/Makefile
components/gnump/Solaris/gmp.h
components/gnump/Solaris/index.html
components/gnump/Solaris/libgmp-64.pc
components/gnump/Solaris/libgmp.3
components/gnump/Solaris/libgmp.pc
components/gnump/Solaris/libgmpxx-64.pc
components/gnump/Solaris/libgmpxx.pc
components/gnump/gmp.license
components/gnump/gmp.p5m
components/gnump/patches/000-Makefile.in.patch
components/gnump/patches/001-pkgconfig.patch
components/gnump/patches/001-t-istream.cc.patch
components/gnump/patches/002-t-ostream.cc.patch
components/gnump/patches/003-Makefile.in.patch
components/gnump/patches/004-t-modlinv.c.patch
components/gnump/patches/005-gmp-h.in.patch
components/gnump/patches/006-configure.patch
components/gnump/patches/007-Makefile.in.patch
components/gnump/patches/008-ismpz.cc.patch
components/gnump/patches/009-ismpf.cc.patch
components/gnump/patches/010-osmpf.cc.patch
components/gnump/patches/011-assert.c.patch
components/gnump/patches/012-gen-fib.c.patch
components/gnump/patches/013-config.guess.patch
components/gnump/test/results-32.master
components/gnump/test/results-64.master
components/gnump/test/results-all.master
components/mpc/Makefile
components/mpfr/Makefile
components/ruby/ruby-21/Makefile
components/ruby/ruby-23/Makefile
--- a/components/gawk/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gawk/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -65,7 +65,9 @@
 
 COMPONENT_SYSTEM_TEST_ARGS = AWKPROG=$(USRBINDIR)/gawk
 
+REQUIRED_PACKAGES += library/gmp
 REQUIRED_PACKAGES += library/libsigsegv
+REQUIRED_PACKAGES += library/mpfr
 REQUIRED_PACKAGES += library/readline
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/math
--- a/components/gcc4/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gcc4/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -98,7 +98,7 @@
 CONFIGURE_OPTIONS +=	--disable-rpath
 CONFIGURE_OPTIONS +=	--with-system-zlib
 CONFIGURE_OPTIONS +=	--with-build-config=no
-CONFIGURE_OPTIONS +=	--with-gmp-include=$(USRINCDIR)/gmp
+CONFIGURE_OPTIONS +=	--with-gmp-include=$(shell pkg-config --variable=includedir libgmp)
 CONFIGURE_OPTIONS +=	--with-mpfr-include=$(USRINCDIR)/mpfr
 CONFIGURE_OPTIONS +=	--without-gnu-ld --with-ld=$(USRBINDIR)/ld
 CONFIGURE_OPTIONS +=	--with-gnu-as --with-as=$(GNUBIN)/as
--- a/components/gcc5/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gcc5/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -102,7 +102,7 @@
 CONFIGURE_OPTIONS +=	--disable-rpath
 CONFIGURE_OPTIONS +=	--with-system-zlib
 CONFIGURE_OPTIONS +=	--with-build-config=no
-CONFIGURE_OPTIONS +=	--with-gmp-include=$(USRINCDIR)/gmp
+CONFIGURE_OPTIONS +=	--with-gmp-include=$(shell pkg-config --variable=includedir libgmp)
 CONFIGURE_OPTIONS +=	--with-mpfr-include=$(USRINCDIR)/mpfr
 CONFIGURE_OPTIONS +=	--without-gnu-ld --with-ld=$(USRBINDIR)/ld
 CONFIGURE_OPTIONS +=	--with-gnu-as --with-as=$(GNUBIN)/as
--- a/components/gnump/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gnump/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -22,59 +22,82 @@
 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64_and_32
+COMPILER=gcc
 include ../../make-rules/shared-macros.mk
 
 PATH=$(dir $(CC)):$(USRBINDIR):$(GNUBIN)
 
-COMPONENT_NAME=		gnump
-COMPONENT_VERSION=      4.3.2
+COMPONENT_NAME=		gmp
+COMPONENT_VERSION=      6.1.2
 COMPONENT_PROJECT_URL=	http://gmplib.org/
-COMPONENT_SRC_NAME=	gmp
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.xz 
 COMPONENT_ARCHIVE_HASH= \
-    sha256:7be3ad1641b99b17f6a8be6a976f1f954e997c41e919ad7e0c418fe848c13c97
-COMPONENT_ARCHIVE_URL=  http://ftp.gnu.org/gnu/gmp/$(COMPONENT_ARCHIVE)
+    sha256:87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
+COMPONENT_ARCHIVE_URL=  https://gmplib.org/download/gmp/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/gnump
 COMPONENT_ANITYA_ID=	1186
 
-TPNO=			16955
+TPNO=			33317
+TPNO_4.3.2=		16955
+
+COMPONENT_VERSION_1=      4.3.2
+COMPONENT_SRC_1=          $(COMPONENT_NAME)-$(COMPONENT_VERSION_1)
+COMPONENT_ARCHIVE_1=      $(COMPONENT_SRC_1).tar.gz
+COMPONENT_ARCHIVE_HASH_1= \
+    sha256:7be3ad1641b99b17f6a8be6a976f1f954e997c41e919ad7e0c418fe848c13c97
+COMPONENT_ARCHIVE_URL_1=  http://ftp.gnu.org/gnu/gmp/$(COMPONENT_ARCHIVE_1)
+
+
+COMPONENT_PREP_ACTION = (cd $(@D) ; $(AUTORECONF) -fiv)
 
 # We need to build an extra static version of this library for
 # GRUB/Wanboot support.
 
-ifeq ($(MACH),i386)
+WANBOOT_CONFIGURE.amd64 = $(BUILD_DIR)/wanboot-amd64/.configured
+WANBOOT_BUILD.amd64 = $(BUILD_DIR)/wanboot-amd64/.built
+WANBOOT_INSTALL.amd64 = $(BUILD_DIR)/wanboot-amd64/.installed
+
+CONFIGURE_32_and_64 += $(WANBOOT_CONFIGURE.$(MACH64))
+BUILD_32_and_64 += $(WANBOOT_BUILD.$(MACH64))
+INSTALL_32_and_64 += $(WANBOOT_INSTALL.$(MACH64))
 
-WANBOOT_CONFIGURE = $(BUILD_DIR)/wanboot-amd64/.configured
-WANBOOT_BUILD = $(BUILD_DIR)/wanboot-amd64/.built
-WANBOOT_INSTALL = $(BUILD_DIR)/wanboot-amd64/.installed
+$(BUILD_DIR_64)/.installed:	$(WANBOOT_INSTALL.$(MACH64))
+
+
+# Macros to configure, build, and install the old version so we can contiune
+# to deliver runtime support for GCC until a newer build of GCC built against
+# the new GNU MP is part of the CBE.  Once the newer GCC packages are
+# on the build systems, we can stop building and delivering the old version.
+BUILD_OLD_DIR_32 = $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH32)
+BUILD_OLD_DIR_64 = $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH64)
 
-CONFIGURE_32_and_64 += $(WANBOOT_CONFIGURE)
-BUILD_32_and_64 += $(WANBOOT_BUILD)
-INSTALL_32_and_64 += $(WANBOOT_INSTALL)
+$(BUILD_OLD_DIR_32)/.configured: CONFIGURE_SCRIPT = $(SOURCE_DIR_1)/configure
+$(BUILD_OLD_DIR_64)/.configured: CONFIGURE_SCRIPT = $(SOURCE_DIR_1)/configure
+$(BUILD_OLD_DIR_32)/.configured:        BITS=32
+$(BUILD_OLD_DIR_64)/.configured:        BITS=64
+
+CONFIGURE_32 +=	$(BUILD_OLD_DIR_32)/.configured
+CONFIGURE_64 +=	$(BUILD_OLD_DIR_64)/.configured
+
+BUILD_32 += $(BUILD_OLD_DIR_32)/.built
+BUILD_64 += $(BUILD_OLD_DIR_64)/.built
 
-endif
+INSTALL_32 += $(BUILD_OLD_DIR_32)/.installed
+INSTALL_64 += $(BUILD_OLD_DIR_64)/.installed
 
-CONFIGURE_TARGET=
-BUILD_TARGET=
-INSTALL_TARGET=
+# install the old version first
+$(BUILD_DIR_32)/.installed:     $(BUILD_OLD_DIR_32)/.installed
+$(BUILD_DIR_64)/.installed:     $(BUILD_OLD_DIR_64)/.installed
+#
+# End old version
+
 include $(WS_MAKE_RULES)/gnu-component.mk
 
+
 MCS = mcs
 STRIP = strip
 
-PATCH_LEVEL = 0
-
-CLEAN_PATHS += libgmp.pc libgmpxx.pc
-
-CFLAGS.shared += -features=extinl,extensions
-CFLAGS.shared += -xustr=ascii_utf16_ushort -xcsi
-# -xthreadvar=%all: allow thread-local storage via __thread
-#  qualifier for all types of variables (global, static and dynamic)
-CFLAGS.shared += -xthreadvar=%all $(CPP_C99_EXTENDED_MATH)
-CFLAGS.shared += $(studio_C99_ENABLE) $(CPP_XPG6MODE)
-CFLAGS.shared += $(studio_PIC)
-
 # Set the wanboot CFLAGS as needed for the wanboot compilation
-
 CFLAGS.wanboot += -D_BOOT
 CFLAGS.wanboot += -g
 CFLAGS.wanboot += -falign-jumps=1
@@ -89,62 +112,35 @@
 CFLAGS.wanboot += -fno-stack-protector
 CFLAGS.wanboot += -mno-stack-arg-probe
 
-CXXFLAGS.shared = -mt -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic
-CXXFLAGS.shared += -instances=global -template=geninlinefuncs
-CXXFLAGS.shared += -xbuiltin=%none -xinline=%auto -xlibmil
-CXXFLAGS.shared += -xustr=ascii_utf16_ushort -xlibmopt
-CXXFLAGS.shared += $(studio_cplusplus_C99_ENABLE) $(studio_PIC)
-CXXFLAGS.shared += $(CPP_XPG5MODE)
-# -Qoption ccfe -features=zla: allow VLA/ZLA in C++ (like in C99)
-CXXFLAGS.shared += -Qoption ccfe -features=zla
-CXXFLAGS.shared += -xF=%none -xthreadvar=%all
-CPPFLAGS.shared += $(CPP_POSIX) $(CPP_LARGEFILES)
-LDFLAGS += $(LD_Z_REDLOCSYM) $(LD_Z_RESCAN_NOW)
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
-CXX.studio.32 += -std=sun03
-CXX.studio.64 += -std=sun03
+# We want to run tests in a stripped environment so nothing interferes
+COMPONENT_TEST_ENV += -i
 
 COMPONENT_TEST_TRANSFORMS += \
-     '-e "/libtool/d"' \
-     '-e "/-m32/d"' \
-     '-e "/-m64/d"' \
-     '-e "/DEPDIR=/d"' \
-     '-e "/ld: warning/d"' \
-     '-e "/creating /d"' \
-     '-e "/gm4 /d"' \
-     '-e "s/^make\[[0-9]\{1,\}\]/make/g"'
+	'-e "s/^make\[[0-9]\{1,\}\]/make/g"' \
+	'-n ' \
+	'-e "/make:.*directory/p" ' \
+	'-e "/PASS/p" ' \
+	'-e "/FAIL/p" ' \
+	'-e "/SKIP/p" ' \
+	'-e "/ERROR/p" ' \
+	'-e "/=====/p" ' \
+	'-e "/TOTAL/p" '
 
-# assembler detection for GNU MP and GNU MPFR is done via MPN_PATH
-# at ./configure time. GNU MPFR wants to know GNU MP's MPN_PATH.
-MPN32_i386 = x86/pentium x86 generic
-MPN64_i386 = x86_64/pentium4 x86_64 generic
-MPN32_sparc = sparc32/v9 sparc32 generic
-MPN64_sparc = sparc64 generic
-MPN_32 = $(MPN32_$(MACH))
-MPN_64 = $(MPN64_$(MACH))
-GM4 = /usr/bin/gm4
+PARCH.32 =	$(MACH:i386=i386-pc)
+PARCH.64 =	$(MACH:i386=x86_64-pc)
+GNU_TRIPLE.32 =	$(PARCH.32:sparc=sparc-sun)-solaris$(SOLARIS_VERSION)
+GNU_TRIPLE.64 =	$(PARCH.64:sparc=sparcv9-sun)-solaris$(SOLARIS_VERSION)
 
-CONFIGURE_ENV += LD="$(CC) $(CFLAGS) $(LDFLAGS)"
-CONFIGURE_ENV += CXXLD="$(CXX) $(CC_BITS) $(CXXFLAGS) $(LDFLAGS)"
-CONFIGURE_ENV += CPP="$(CC) $(CPPFLAGS) $(CFLAGS) -E"
-CONFIGURE_ENV += CPP_FOR_BUILD="$(CC) $(CPPFLAGS) $(CFLAGS) -E"
-CONFIGURE_ENV += CXXCPP="$(CXX) $(CC_BITS) $(CPPFLAGS) $(CXXFLAGS) -E"
-CONFIGURE_ENV += INSTALL="$(INSTALL)"
-CONFIGURE_ENV += CC_FOR_BUILD="$(CC) $(CPPFLAGS) $(CFLAGS)"
-CONFIGURE_ENV += M4="$(GM4)"
-CONFIGURE_ENV += SED="$(GSED)"
-CONFIGURE_ENV += ABI="$(BITS)"
-CONFIGURE_ENV += "MPN_PATH=$(MPN_$(BITS))"
+CONFIGURE_OPTIONS += --host $(GNU_TRIPLE.$(BITS))
 
-CONFIGURE_OPTIONS += --includedir=$(USRINCDIR)/gmp
-CONFIGURE_OPTIONS += --localstatedir=$(VARDIR)
 CONFIGURE_OPTIONS.shared += --enable-shared
 CONFIGURE_OPTIONS.shared += --disable-static
 CONFIGURE_OPTIONS += --disable-libtool-lock
 CONFIGURE_OPTIONS += --disable-alloca
 CONFIGURE_OPTIONS.shared += --enable-cxx
 CONFIGURE_OPTIONS += --enable-fft
-CONFIGURE_OPTIONS += --enable-mpbsd
 CONFIGURE_OPTIONS += --disable-fat
 CONFIGURE_OPTIONS.shared += --with-pic
 
@@ -161,41 +157,8 @@
 CONFIGURE_OPTIONS.wanboot += --without-readline
 CONFIGURE_OPTIONS.wanboot += --without-pic
 
-PROTOUSRSHAREHTMLDIR = $(PROTOUSRSHAREDIR)/doc/gmp/html
-
-# libgmpxx.so.4 always gets built with unnecessary paths in RUNPATH/RPATH
 COMPONENT_POST_INSTALL_ACTION.shared = \
-    ( $(MKDIR) $(PROTOUSRSHAREHTMLDIR) ; \
-      $(MKDIR) $(PROTOUSRSHAREMAN3DIR) ; \
-      $(MKDIR) $(PROTOPKGCONFIGDIR) ; \
-      $(MKDIR) $(PROTOPKGCONFIGDIR64) ; \
-      $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR)" \
-	$(PROTOUSRLIBDIR)/libgmpxx.so.4.1.2 ; \
-      $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR64)" \
-	$(PROTOUSRLIBDIR64)/libgmpxx.so.4.1.2 ; \
-      $(ELFEDIT) -e "dyn:rpath $(USRLIBDIR)" \
-	$(PROTOUSRLIBDIR)/libgmpxx.so.4.1.2 ; \
-      $(ELFEDIT) -e "dyn:rpath $(USRLIBDIR64)" \
-	$(PROTOUSRLIBDIR64)/libgmpxx.so.4.1.2 ; \
-      $(GSED) -e "s/MACH64/$(MACH64)/g" \
-	$(COMPONENT_DIR)/Solaris/libgmp-64.pc > $(COMPONENT_DIR)/libgmp.pc ; \
-      $(GSED) -e "s/MACH64/$(MACH64)/g" \
-	$(COMPONENT_DIR)/Solaris/libgmpxx-64.pc > \
-	    $(COMPONENT_DIR)/libgmpxx.pc ; \
-      $(MV) $(PROTOUSRINCDIR)/gmp.h $(PROTOUSRINCDIR)/gmp/ ; \
-      $(MV) $(PROTOUSRINCDIR)/mp.h $(PROTOUSRINCDIR)/gmp/ ; \
-      $(INSTALL) -m 0644 $(COMPONENT_DIR)/Solaris/index.html \
-	$(PROTOUSRSHAREHTMLDIR)/ ; \
-      $(INSTALL) -m 0644 $(COMPONENT_DIR)/Solaris/libgmp.pc \
-	$(PROTOPKGCONFIGDIR) ; \
-      $(INSTALL) -m 0644 $(COMPONENT_DIR)/Solaris/libgmpxx.pc \
-	$(PROTOPKGCONFIGDIR) ; \
-      $(INSTALL) -m 0644 $(COMPONENT_DIR)/libgmp.pc \
-	$(PROTOPKGCONFIGDIR64) ; \
-      $(INSTALL) -m 0644 $(COMPONENT_DIR)/libgmpxx.pc \
-	$(PROTOPKGCONFIGDIR64) ; \
-      $(INSTALL) -m 0644 $(COMPONENT_DIR)/Solaris/libgmp.3 \
-	$(PROTOUSRSHAREMAN3DIR)/ )
+	(cd $(PROTOUSRINCDIR) ; $(MV) -f gmp.h gmp-$(BITS).h)
 
 COMPONENT_POST_INSTALL_ACTION.wanboot = \
       ( $(MKDIR) $(PROTOUSRLIBDIR)/grub/wanboot; \
@@ -210,13 +173,7 @@
 # common targets
 configure:	$(CONFIGURE_32_and_64)
 
-$(BUILD_DIR)/$(MACH32)/.configured: CPPFLAGS += $(CPPFLAGS.shared)
-$(BUILD_DIR)/$(MACH32)/.configured: CFLAGS += $(CFLAGS.shared)
-$(BUILD_DIR)/$(MACH32)/.configured: CXXFLAGS += $(CXXFLAGS.shared)
 $(BUILD_DIR)/$(MACH32)/.configured: CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.shared)
-$(BUILD_DIR)/$(MACH64)/.configured: CPPFLAGS += $(CPPFLAGS.shared)
-$(BUILD_DIR)/$(MACH64)/.configured: CFLAGS += $(CFLAGS.shared)
-$(BUILD_DIR)/$(MACH64)/.configured: CXXFLAGS += $(CXXFLAGS.shared)
 $(BUILD_DIR)/$(MACH64)/.configured: CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.shared)
 $(BUILD_DIR)/wanboot-amd64/.configured: BITS=64
 $(BUILD_DIR)/wanboot-amd64/.configured: COMPILER=gcc
@@ -233,4 +190,5 @@
 $(BUILD_DIR)/$(MACH64)/.installed: COMPONENT_POST_INSTALL_ACTION = $(COMPONENT_POST_INSTALL_ACTION.shared)
 $(BUILD_DIR)/wanboot-amd64/.installed: COMPONENT_POST_INSTALL_ACTION = $(COMPONENT_POST_INSTALL_ACTION.wanboot)
 
-REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnump/Solaris/gmp.h	Thu Mar 30 08:44:01 2017 -0700
@@ -0,0 +1,6 @@
+#include <sys/isa_defs.h>
+#ifdef _LP64
+#include <gmp-64.h>
+#else
+#include <gmp-32.h>
+#endif
--- a/components/gnump/Solaris/index.html	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-<html lang="en">
-<head>
-<title>GNU MP 4.3.2</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="description" content="How to install and use the GNU multiple precision arithmetic library, version 4.3.2.">
-<meta name="generator" content="makeinfo 4.8">
-<link title="Top" rel="start" href="index.html#Top">
-<link rel="up" href="http://gmplib.org/index.html#dir" title="(dir)">
-<link rel="prev" href="http://gmplib.org/index.html#dir" title="(dir)">
-<link rel="next" href="http://gmplib.org/manual-4.3.2/Copying.html#Copying" title="Copying">
-<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
-<!--
-This manual describes how to install and use the GNU multiple precision
-arithmetic library, version 4.3.2.
-
-Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU Free Documentation License, Version 1.3 or any later
-version published by the Free Software Foundation; with no Invariant Sections,
-with the Front-Cover Texts being ``A GNU Manual'', and with the Back-Cover
-Texts being ``You have freedom to copy and modify this GNU Manual, like GNU
-software''.  A copy of the license is included in
-*Note GNU Free Documentation License::.-->
-<meta http-equiv="Content-Style-Type" content="text/css">
-<style type="text/css"><!--
-  pre.display { font-family:inherit }
-  pre.format  { font-family:inherit }
-  pre.smalldisplay { font-family:inherit; font-size:smaller }
-  pre.smallformat  { font-family:inherit; font-size:smaller }
-  pre.smallexample { font-size:smaller }
-  pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
---></style>
-</head>
-<body>
-<div class="node">
-<p>
-<a name="Top"></a>
-Next:&nbsp;<a rel="next" accesskey="n" href="http://gmplib.org/manual-4.3.2/Copying.html#Copying">Copying</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="http://gmplib.org/index.html#dir">(dir)</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="http://gmplib.org/index.html#dir">(dir)</a>
-<hr>
-</div>
-
-<h2 class="unnumbered">GNU MP</h2>
-
-   <p>This manual describes how to install and use the GNU multiple precision
-arithmetic library, version 4.3.2.
-
-   <p>Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-   <p>Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU Free Documentation License, Version 1.3 or any later
-version published by the Free Software Foundation; with no Invariant Sections,
-with the Front-Cover Texts being &ldquo;A GNU Manual&rdquo;, and with the Back-Cover
-Texts being &ldquo;You have freedom to copy and modify this GNU Manual, like GNU
-software&rdquo;.  A copy of the license is included in
-<a href="http://gmplib.org/manual-4.3.2/GNU-Free-Documentation-License.html#GNU-Free-Documentation-License">GNU Free Documentation License</a>.
-   <pre class="sp">
-
-</pre>
-
-<!-- Don't bother with contents for html, the menus seem adequate. -->
-<ul class="menu">
-<li><a accesskey="1" href="http://gmplib.org/manual-4.3.2/Copying.html#Copying">Copying</a>:                     GMP Copying Conditions (LGPL). 
-<li><a accesskey="2" href="http://gmplib.org/manual-4.3.2/Introduction-to-GMP.html#Introduction-to-GMP">Introduction to GMP</a>:         Brief introduction to GNU MP. 
-<li><a accesskey="3" href="http://gmplib.org/manual-4.3.2/Installing-GMP.html#Installing-GMP">Installing GMP</a>:              How to configure and compile the GMP library. 
-<li><a accesskey="4" href="http://gmplib.org/manual-4.3.2/GMP-Basics.html#GMP-Basics">GMP Basics</a>:                  What every GMP user should know. 
-<li><a accesskey="5" href="http://gmplib.org/manual-4.3.2/Reporting-Bugs.html#Reporting-Bugs">Reporting Bugs</a>:              How to usefully report bugs. 
-<li><a accesskey="6" href="http://gmplib.org/manual-4.3.2/Integer-Functions.html#Integer-Functions">Integer Functions</a>:           Functions for arithmetic on signed integers. 
-<li><a accesskey="7" href="http://gmplib.org/manual-4.3.2/Rational-Number-Functions.html#Rational-Number-Functions">Rational Number Functions</a>:   Functions for arithmetic on rational numbers. 
-<li><a accesskey="8" href="http://gmplib.org/manual-4.3.2/Floating_002dpoint-Functions.html#Floating_002dpoint-Functions">Floating-point Functions</a>:    Functions for arithmetic on floats. 
-<li><a accesskey="9" href="http://gmplib.org/manual-4.3.2/Low_002dlevel-Functions.html#Low_002dlevel-Functions">Low-level Functions</a>:         Fast functions for natural numbers. 
-<li><a href="http://gmplib.org/manual-4.3.2/Random-Number-Functions.html#Random-Number-Functions">Random Number Functions</a>:     Functions for generating random numbers. 
-<li><a href="http://gmplib.org/manual-4.3.2/Formatted-Output.html#Formatted-Output">Formatted Output</a>:            <code>printf</code> style output. 
-<li><a href="http://gmplib.org/manual-4.3.2/Formatted-Input.html#Formatted-Input">Formatted Input</a>:             <code>scanf</code> style input. 
-<li><a href="http://gmplib.org/manual-4.3.2/C_002b_002b-Class-Interface.html#C_002b_002b-Class-Interface">C++ Class Interface</a>:         Class wrappers around GMP types. 
-<li><a href="http://gmplib.org/manual-4.3.2/BSD-Compatible-Functions.html#BSD-Compatible-Functions">BSD Compatible Functions</a>:    All functions found in BSD MP. 
-<li><a href="http://gmplib.org/manual-4.3.2/Custom-Allocation.html#Custom-Allocation">Custom Allocation</a>:           How to customize the internal allocation. 
-<li><a href="http://gmplib.org/manual-4.3.2/Language-Bindings.html#Language-Bindings">Language Bindings</a>:           Using GMP from other languages. 
-<li><a href="http://gmplib.org/manual-4.3.2/Algorithms.html#Algorithms">Algorithms</a>:                  What happens behind the scenes. 
-<li><a href="http://gmplib.org/manual-4.3.2/Internals.html#Internals">Internals</a>:                   How values are represented behind the scenes.
-
-<li><a href="http://gmplib.org/manual-4.3.2/Contributors.html#Contributors">Contributors</a>:                Who brings you this library? 
-<li><a href="http://gmplib.org/manual-4.3.2/References.html#References">References</a>:                  Some useful papers and books to read. 
-<li><a href="http://gmplib.org/manual-4.3.2/GNU-Free-Documentation-License.html#GNU-Free-Documentation-License">GNU Free Documentation License</a>
-<li><a href="http://gmplib.org/manual-4.3.2/Concept-Index.html#Concept-Index">Concept Index</a>
-<li><a href="http://gmplib.org/manual-4.3.2/Function-Index.html#Function-Index">Function Index</a>
-</ul>
-
-<!-- @m{T,N} is $T$ in tex or @math{N} otherwise.  This is an easy way to give -->
-<!-- different forms for math in tex and info.  Commas in N or T don't work, -->
-<!-- but @C{} can be used instead.  \, works in info but not in tex. -->
-<!-- @ms{V,N} is $V_N$ in tex or just vn otherwise.  This suits simple -->
-<!-- subscripts like @ms{x,0}. -->
-<!-- @nicode{S} is plain S in info, or @code{S} elsewhere.  This can be used -->
-<!-- when the quotes that @code{} gives in info aren't wanted, but the -->
-<!-- fontification in tex or html is wanted.  Doesn't work as @nicode{'\\0'} -->
-<!-- though (gives two backslashes in tex). -->
-<!-- @nisamp{S} is plain S in info, or @samp{S} elsewhere.  This can be used -->
-<!-- when the quotes that @samp{} gives in info aren't wanted, but the -->
-<!-- fontification in tex or html is wanted. -->
-<!-- Usage: @GMPtimes{} -->
-<!-- Give either \times or the word "times". -->
-<!-- Usage: @GMPmultiply{} -->
-<!-- Give * in info, or nothing in tex. -->
-<!-- Usage: @GMPabs{x} -->
-<!-- Give either |x| in tex, or abs(x) in info or html. -->
-<!-- Usage: @GMPfloor{x} -->
-<!-- Give either \lfloor x\rfloor in tex, or floor(x) in info or html. -->
-<!-- Usage: @GMPceil{x} -->
-<!-- Give either \lceil x\rceil in tex, or ceil(x) in info or html. -->
-<!-- Math operators already available in tex, made available in info too. -->
-<!-- For example @bmod{} can be used in both tex and info. -->
-<!-- New math operators. -->
-<!-- @abs{} can be used in both tex and info, or just \abs in tex. -->
-<!-- @cross{} is a \times symbol in tex, or an "x" in info.  In tex it works -->
-<!-- inside or outside $ $. -->
-<!-- @times{} made available as a "*" in info and html (already works in tex). -->
-<!-- Usage: @W{text} -->
-<!-- Like @w{} but working in math mode too. -->
-<!-- Usage: \GMPdisplay{text} -->
-<!-- Put the given text in an @display style indent, but without turning off -->
-<!-- paragraph reflow etc. -->
-<!-- Usage: \GMPhat -->
-<!-- A new \hat that will work in math mode, unlike the texinfo redefined -->
-<!-- version. -->
-<!-- Usage: \GMPraise{text} -->
-<!-- For use in a $ $ math expression as an alternative to "^".  This is good -->
-<!-- for @code{} in an exponent, since there seems to be no superscript font -->
-<!-- for that. -->
-<!-- Usage: @texlinebreak{} -->
-<!-- A line break as per @*, but only in tex. -->
-<!-- Usage: @maybepagebreak -->
-<!-- Allow tex to insert a page break, if it feels the urge. -->
-<!-- Normally blocks of @deftypefun/funx are kept together, which can lead to -->
-<!-- some poor page break positioning if it's a big block, like the sets of -->
-<!-- division functions etc. -->
-<!-- Usage: @GMPreftop{info,title} -->
-<!-- Usage: @GMPpxreftop{info,title} -->
-<!-- Like @ref{} and @pxref{}, but designed for a reference to the top of a -->
-<!-- document, not a particular section.  The TeX output for plain @ref insists -->
-<!-- on printing a particular section, GMPreftop gives just the title. -->
-<!-- The texinfo manual recommends putting a likely section name in references -->
-<!-- like this, eg. "Introduction", but it seems better to just give the title. -->
-</body></html>
-
--- a/components/gnump/Solaris/libgmp-64.pc	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/MACH64
-includedir=${prefix}/include/gmp
-
-Name: libgmp
-Description: The GNU Multiple Precision Bignum Library
-Version: 4.3.2
-Libs: -L${libdir} -lgmp
-Cflags: -I${includedir}
--- a/components/gnump/Solaris/libgmp.3	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gnump/Solaris/libgmp.3	Thu Mar 30 08:44:01 2017 -0700
@@ -4,7 +4,7 @@
 .\" and to add a note about source availability.
 .\" 
 .\" generic libgd man page for the LibGMP Project
-.TH libgmp 3 "12 Nov 2010" "GNU MP 4.3.2" "Libraries"
+.TH libgmp 3 "22 Nov 2016" "GNU MP 6.1.1" "Libraries"
 
 .SH NAME
 \fBlibgmp\fP,
--- a/components/gnump/Solaris/libgmp.pc	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/gmp
-
-Name: libgmp
-Description: The GNU Multiple Precision Bignum Library
-Version: 4.3.2
-Libs: -L${libdir} -lgmp
-Cflags: -I${includedir}
--- a/components/gnump/Solaris/libgmpxx-64.pc	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/MACH64
-includedir=${prefix}/include/gmp
-
-Name: libgmpxx
-Description: The GNU Multiple Precision Bignum Library
-Version: 4.3.2
-Libs: -L${libdir} -lgmp -lgmpxx
-Cflags: -I${includedir}
--- a/components/gnump/Solaris/libgmpxx.pc	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/gmp
-
-Name: libgmpxx
-Description: The GNU Multiple Precision Bignum Library
-Version: 4.3.2
-Libs: -L${libdir} -lgmp -lgmpxx
-Cflags: -I${includedir}
--- a/components/gnump/gmp.license	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gnump/gmp.license	Thu Mar 30 08:44:01 2017 -0700
@@ -1,1295 +1,24 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-----------------------------------------------------------------------
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of either:
 
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
 
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
+or
 
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+  * the GNU General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your option) any
+    later version.
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
--------------------------------------------------------------------------
-
-                GNU Free Documentation License
-                 Version 1.3, 3 November 2008
-
-
- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-     <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-The "publisher" means any person or entity that distributes copies of
-the Document to the public.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-2. VERBATIM COPYING
+or both in parallel, as here.
 
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no
-other conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to
-give them a chance to provide you with an updated version of the
-Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
+The GNU MP Library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other
-documents released under this License, and replace the individual
-copies of this License in the various documents with a single copy
-that is included in the collection, provided that you follow the rules
-of this License for verbatim copying of each of the documents in all
-other respects.
-
-You may extract a single document from such a collection, and
-distribute it individually under this License, provided you insert a
-copy of this License into the extracted document, and follow this
-License in all other respects regarding verbatim copying of that
-document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense, or distribute it is void, and
-will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
+You should have received copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.
 
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, receipt of a copy of some or all of the same material does
-not give you any rights to use it.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions of the
-GNU Free Documentation License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in
-detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.  If the Document
-specifies that a proxy can decide which future versions of this
-License can be used, that proxy's public statement of acceptance of a
-version permanently authorizes you to choose that version for the
-Document.
-
-11. RELICENSING
-
-"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
-World Wide Web server that publishes copyrightable works and also
-provides prominent facilities for anybody to edit those works.  A
-public wiki that anybody can edit is an example of such a server.  A
-"Massive Multiauthor Collaboration" (or "MMC") contained in the site
-means any set of copyrightable works thus published on the MMC site.
-
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 
-license published by Creative Commons Corporation, a not-for-profit 
-corporation with a principal place of business in San Francisco, 
-California, as well as future copyleft versions of that license 
-published by that same organization.
-
-"Incorporate" means to publish or republish a Document, in whole or in 
-part, as part of another Document.
-
-An MMC is "eligible for relicensing" if it is licensed under this 
-License, and if all works that were first published under this License 
-somewhere other than this MMC, and subsequently incorporated in whole or 
-in part into the MMC, (1) had no cover texts or invariant sections, and 
-(2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site
-under CC-BY-SA on the same site at any time before August 1, 2009,
-provided the MMC is eligible for relicensing.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
--- a/components/gnump/gmp.p5m	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/gnump/gmp.p5m	Thu Mar 30 08:44:01 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -26,43 +26,55 @@
 set name=pkg.summary value="GNU Multiple Precision Bignum Library"
 set name=com.oracle.info.description \
     value="the GNU Multiple Precision Bignum Library"
-set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/High Performance Computing"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/634
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-#
-file path=usr/include/gmp/gmp.h
-file path=usr/include/gmp/gmpxx.h
-file path=usr/include/gmp/mp.h
-link path=usr/lib/$(MACH64)/libgmp.so target=libgmp.so.3.5.2
-link path=usr/lib/$(MACH64)/libgmp.so.3 target=libgmp.so.3.5.2
-file path=usr/lib/$(MACH64)/libgmp.so.3.5.2
-link path=usr/lib/$(MACH64)/libgmpxx.so target=libgmpxx.so.4.1.2
-link path=usr/lib/$(MACH64)/libgmpxx.so.4 target=libgmpxx.so.4.1.2
-file path=usr/lib/$(MACH64)/libgmpxx.so.4.1.2
+file path=usr/include/gmp-32.h
+file path=usr/include/gmp-64.h
+file Solaris/gmp.h path=usr/include/gmp.h
+file path=usr/include/gmpxx.h
+link path=usr/lib/$(MACH64)/libgmp.so target=libgmp.so.10.3.2
+link path=usr/lib/$(MACH64)/libgmp.so.10 target=libgmp.so.10.3.2
+file path=usr/lib/$(MACH64)/libgmp.so.10.3.2
+file path=usr/lib/$(MACH64)/libgmp.so.3
+link path=usr/lib/$(MACH64)/libgmpxx.so target=libgmpxx.so.4.5.2
+link path=usr/lib/$(MACH64)/libgmpxx.so.4 target=libgmpxx.so.4.5.2
+file path=usr/lib/$(MACH64)/libgmpxx.so.4.5.2
 file path=usr/lib/$(MACH64)/llib-lgmp.ln
 file path=usr/lib/$(MACH64)/pkgconfig/libgmp.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libgmpxx.pc
 file path=usr/lib/grub/wanboot/libgmp.a variant.arch=i386
-link path=usr/lib/libgmp.so target=libgmp.so.3.5.2
-#
-link path=usr/lib/libgmp.so.3 target=libgmp.so.3.5.2
-file path=usr/lib/libgmp.so.3.5.2
-link path=usr/lib/libgmpxx.so target=libgmpxx.so.4.1.2
-link path=usr/lib/libgmpxx.so.4 target=libgmpxx.so.4.1.2
-file path=usr/lib/libgmpxx.so.4.1.2
+link path=usr/lib/libgmp.so target=libgmp.so.10.3.2
+link path=usr/lib/libgmp.so.10 target=libgmp.so.10.3.2
+file path=usr/lib/libgmp.so.10.3.2
+file path=usr/lib/libgmp.so.3
+link path=usr/lib/libgmpxx.so target=libgmpxx.so.4.5.2
+link path=usr/lib/libgmpxx.so.4 target=libgmpxx.so.4.5.2
+file path=usr/lib/libgmpxx.so.4.5.2
 file path=usr/lib/llib-lgmp
 file path=usr/lib/llib-lgmp.ln
 file path=usr/lib/pkgconfig/libgmp.pc
 file path=usr/lib/pkgconfig/libgmpxx.pc
-file path=usr/share/doc/gmp/html/index.html
 file path=usr/share/info/gmp.info
 file path=usr/share/info/gmp.info-1
 file path=usr/share/info/gmp.info-2
-file path=usr/share/man/man3/libgmp.3
-#
-license gmp.license license="LGPLv3, GPLv3, FDLv1.3"
+file Solaris/libgmp.3 path=usr/share/man/man3/libgmp.3
+license FDLv1.3 license=FDLv1.3 \
+    com.oracle.info.description="the GNU Multiple Precision Bignum Library" \
+    com.oracle.info.name=GMP com.oracle.info.tpno=$(TPNO)
+license gmp.license license=GMP \
+    com.oracle.info.description="the GNU Multiple Precision Bignum Library" \
+    com.oracle.info.name=GMP com.oracle.info.tpno=$(TPNO)
+license COPYINGv2 license=GPLv2 \
+    com.oracle.info.description="the GNU Multiple Precision Bignum Library" \
+    com.oracle.info.name=GMP com.oracle.info.tpno=$(TPNO)
+# this is required until the old version is removed see Makefile for details.
+license COPYINGv3 license=GPLv3 \
+    com.oracle.info.description="the GNU Multiple Precision Bignum Library" \
+    com.oracle.info.name=GMP com.oracle.info.tpno=$(TPNO_4.3.2)
+license COPYING.LESSERv3 license=LGPLv3 \
+    com.oracle.info.description="the GNU Multiple Precision Bignum Library" \
+    com.oracle.info.name=GMP com.oracle.info.tpno=$(TPNO)
--- a/components/gnump/patches/000-Makefile.in.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- tests/cxx/Makefile.in	2010-01-07 12:09:43.000000000 -0800
-+++ tests/cxx/Makefile.in	2010-11-12 11:03:39.810691019 -0800
-@@ -238,7 +238,7 @@
- LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
- LIBOBJS = @LIBOBJS@
- LIBREADLINE = @LIBREADLINE@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lCrun -lCstd
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnump/patches/001-pkgconfig.patch	Thu Mar 30 08:44:01 2017 -0700
@@ -0,0 +1,72 @@
+#
+# Add pkgconfig files for those inclined to use it during a build.
+#
+diff -ruN gmp-6.1.1.orig/libgmp.in gmp-6.1.1/libgmp.in
+--- gmp-6.1.1.orig/libgmp.in	1969-12-31 18:00:00.000000000 +0000
++++ gmp-6.1.1/libgmp.in	2016-11-21 17:16:23.456171594 +0000
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++sharedlibdir=@sharedlibdir@
++includedir=@includedir@
++
++Name: libgmp
++Description: The GNU Multiple Precision Bignum Library
++Version: @VERSION@
++
++Requires:
++Libs: -L${libdir} -lgmp
++Cflags: -I${includedir}
+diff -ruN gmp-6.1.1.orig/libgmpxx.in gmp-6.1.1/libgmpxx.in
+--- gmp-6.1.1.orig/libgmpxx.in	1969-12-31 18:00:00.000000000 +0000
++++ gmp-6.1.1/libgmpxx.in	2016-11-21 17:16:23.456406624 +0000
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++sharedlibdir=@sharedlibdir@
++includedir=@includedir@
++
++Name: libgmpxx
++Description: The GNU Multiple Precision Bignum Library
++Version: @VERSION@
++
++Requires:
++Libs: -L${libdir} -lgmp -lgmpxx
++Cflags: -I${includedir}
+diff -ruN gmp-6.1.1.orig/Makefile.am gmp-6.1.1/Makefile.am
+--- gmp-6.1.1.orig/Makefile.am	2016-06-18 15:00:00.000000000 +0000
++++ gmp-6.1.1/Makefile.am	2016-11-21 17:17:01.968327092 +0000
+@@ -297,6 +297,31 @@
+ libgmpxx_la_LDFLAGS = $(GMP_LDFLAGS) $(LIBGMPXX_LDFLAGS) \
+   -version-info $(LIBGMPXX_LT_CURRENT):$(LIBGMPXX_LT_REVISION):$(LIBGMPXX_LT_AGE)
+ 
++## pkg-config
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libgmp.pc
++EXTRA_DIR = libgmp.in
++
++if WANT_CXX
++pkgconfig_DATA += libgmpxx.pc
++EXTRA_DIR += libgmpxx.in
++endif
++
++pc_verbose = $(pc_verbose_@AM_V@)
++pc_verbose_ = $(pc_verbose_@AM_DEFAULT_V@)
++pc_verbose_0 = @echo "  PC      " $@;
++
++SUFFIXES = .in.pc
++
++.in.pc:
++	$(AM_V_at)rm -f $@
++	$(pc_verbose)sed \
++		-e 's,@prefix[@],$(prefix),g' \
++		-e 's,@exec_prefix[@],$(exec_prefix),g' \
++		-e 's,@libdir[@],$(libdir),g' \
++		-e 's,@includedir[@],$(includedir),g' \
++		-e 's,@VERSION[@],$(VERSION),g' \
++		< $< > $@ || { rm -f $@; exit 1; }
+ 
+ 
+ install-data-hook:
--- a/components/gnump/patches/001-t-istream.cc.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- tests/cxx/t-istream.cc	2007-09-01 06:09:03.000000000 -0400
-+++ tests/cxx/t-istream.cc	2008-11-22 15:51:28.000000000 -0500
-@@ -18,16 +18,16 @@
- along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
- 
- #include <iostream>
-+#include <iomanip>
-+#include <ios>
- #include <cstdlib>
- #include <cstring>
-+using namespace std;
- 
- #include "gmp.h"
- #include "gmp-impl.h"
- #include "tests.h"
- 
--using namespace std;
--
--
- // Under option_check_standard, the various test cases for mpz operator>>
- // are put through the standard operator>> for long, and likewise mpf
- // operator>> is put through double.
--- a/components/gnump/patches/002-t-ostream.cc.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- tests/cxx/t-ostream.cc	2007-09-18 18:44:53.000000000 -0400
-+++ tests/cxx/t-ostream.cc	2008-11-22 15:52:15.000000000 -0500
-@@ -18,15 +18,15 @@
- along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
- 
- #include <iostream>
-+#include <iomanip>
-+#include <ios>
- #include <cstdlib>
-+using namespace std;
- 
- #include "gmp.h"
- #include "gmp-impl.h"
- #include "tests.h"
- 
--using namespace std;
--
--
- int   option_check_standard = 0;
- 
- 
--- a/components/gnump/patches/003-Makefile.in.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- tests/mpbsd/Makefile.in	2010-01-07 12:09:43.000000000 -0800
-+++ tests/mpbsd/Makefile.in	2010-11-12 11:04:43.336814207 -0800
-@@ -245,7 +245,7 @@
- TESTS = $(check_PROGRAMS)
- 
- # check linking only against libmp
--allfuns_LDADD = $(top_builddir)/libmp.la
-+allfuns_LDADD = $(top_builddir)/libmp.la $(top_builddir)/libmp.la
- all: all-am
- 
- .SUFFIXES:
--- a/components/gnump/patches/004-t-modlinv.c.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
---- tests/t-modlinv.c	2009-05-12 02:12:12.000000000 -0400
-+++ tests/t-modlinv.c	2009-09-21 18:25:28.190094000 -0400
-@@ -26,24 +26,24 @@
- #include "tests.h"
- 
- 
--void
-+static void
- one (mp_limb_t n)
- {
--  mp_limb_t  inv, prod;
-+  mp_limb_t  i, p;
- 
--  binvert_limb (inv, n);
--  prod = (inv * n) & GMP_NUMB_MASK;
--  if (prod != 1)
-+  binvert_limb (i, n);
-+  p = (i * n) & GMP_NUMB_MASK;
-+  if (p != 1)
-     {
-       printf ("binvert_limb wrong\n");
-       mp_limb_trace ("  n       ", n);
--      mp_limb_trace ("  got     ", inv);
--      mp_limb_trace ("  product ", prod);
-+      mp_limb_trace ("  got     ", i);
-+      mp_limb_trace ("  product ", p);
-       abort ();
-     }
- }
- 
--void
-+static void
- some (void)
- {
-   int  i;
-@@ -51,7 +51,7 @@
-     one (refmpn_random_limb () | 1);
- }
- 
--void
-+static void
- all (void)
- {
-   mp_limb_t  n;
--- a/components/gnump/patches/005-gmp-h.in.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
---- gmp-h.in	2008-09-10 17:02:01.000000000 -0400
-+++ gmp-h.in	2008-09-19 17:10:39.000000000 -0400
-@@ -28,10 +28,18 @@
- 
- /* Instantiated by configure. */
- #if ! defined (__GMP_WITHIN_CONFIGURE)
--#define __GMP_BITS_PER_MP_LIMB             @BITS_PER_MP_LIMB@
-+#if defined(__amd64) || defined(__sparcv9)
-+#define __GMP_BITS_PER_MP_LIMB 64
-+#else
-+#define __GMP_BITS_PER_MP_LIMB 32
-+#endif
- #define __GMP_HAVE_HOST_CPU_FAMILY_power   @HAVE_HOST_CPU_FAMILY_power@
- #define __GMP_HAVE_HOST_CPU_FAMILY_powerpc @HAVE_HOST_CPU_FAMILY_powerpc@
--#define GMP_LIMB_BITS                      @BITS_PER_MP_LIMB@
-+#if defined(__amd64) || defined(__sparcv9)
-+#define GMP_LIMB_BITS 64
-+#else
-+#define GMP_LIMB_BITS 32
-+#endif
- #define GMP_NAIL_BITS                      @GMP_NAIL_BITS@
- #endif
- #define GMP_NUMB_BITS     (GMP_LIMB_BITS - GMP_NAIL_BITS)
-@@ -427,6 +435,10 @@
- #define __GMP_EXTERN_INLINE      extern __inline__
- #endif
- #define __GMP_INLINE_PROTOTYPES  1
-+#else
-+#ifdef __SUNPRO_C
-+#define __GMP_EXTERN_INLINE     static inline
-+#endif
- #endif
- 
- /* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
--- a/components/gnump/patches/006-configure.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
---- configure	2010-01-07 12:09:40.000000000 -0800
-+++ configure	2011-05-02 12:02:33.178294309 -0700
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # From configure.in Revision.
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for GNU MP 4.3.2.
-@@ -63,7 +63,7 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -575,7 +575,7 @@
- 
- 
- # Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- case X$ECHO in
- X*--fallback-echo)
-@@ -660,7 +660,7 @@
-     elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- 	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-       # If we have ksh, try running configure again with it.
--      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
-       export ORIGINAL_CONFIG_SHELL
-       CONFIG_SHELL=/bin/ksh
-       export CONFIG_SHELL
-@@ -702,7 +702,7 @@
- 	if test "$prev" != 'sed 50q "$0"'; then
- 	  echo_test_string=`eval $prev`
- 	  export echo_test_string
--	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
- 	else
- 	  # Oops.  We lost completely, so just stick with echo.
- 	  echo=echo
-@@ -745,7 +745,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME='GNU MP'
-@@ -2424,7 +2424,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
--SHELL = /bin/sh
-+SHELL = /bin/bash
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
-@@ -2997,7 +2997,7 @@
- 
- 
- # abilist needs to be non-empty, "standard" is just a generic name here
--abilist="standard"
-+abilist="64 32"
- 
- # 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
-@@ -3739,7 +3739,7 @@
-     # reject ABI=64 in favour of ABI=32 if the user has forced the flags to
-     # 32-bit mode.
-     #
--    abilist="32"
-+    abilist="64 32"
-     cclist="gcc acc cc"
-     any_testlist="sizeof-long-4"
- 
-@@ -3803,6 +3803,7 @@
-     case $host in
-       *-*-solaris* | *-*-sunos*)
- 	# Note no -g, it disables all optimizations.
-+	abilist="64 32"
- 	cc_cflags=
- 	cc_cflags_optlist="opt arch cpu"
- 
-@@ -3892,6 +3893,7 @@
-             # recurrently caused problems with miscompilation.  Of course,
-             # -fast is documented as miscompiling things for the sake of speed.
-             #
-+	    abilist="64 32"
-             cclist_64="$cclist_64 cc"
-             cc_64_cflags="-xO3 -xarch=v9"
-             cc_64_cflags_optlist="cpu"
-@@ -4197,8 +4199,9 @@
- esac
- 
- 
--CFLAGS_or_unset=${CFLAGS-'(unset)'}
--CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
-+CFLAGS_or_unset=${CFLAGS}
-+CPPFLAGS_or_unset=${CPPFLAGS}
-+abilist="64 32"
- 
- cat >&5 <<EOF
- User:
-@@ -12394,7 +12397,7 @@
-       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-     else
--      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
-       while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- 	       = "XX$teststring") >/dev/null 2>&1 &&
- 	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-@@ -16449,7 +16452,7 @@
- EGREP=$lt_EGREP
- 
- # The linker used to build libraries.
--LD=$lt_LD
-+LD="$LTCC $LTCFLAGS $LDFLAGS"
- 
- # Whether we need hard or soft links.
- LN_S=$lt_LN_S
-@@ -19523,7 +19526,7 @@
- EGREP=$lt_EGREP
- 
- # The linker used to build libraries.
--LD=$lt_LD_CXX
-+LD="$CC $CXXFLAGS $LDFLAGS"
- 
- # Whether we need hard or soft links.
- LN_S=$lt_LN_S
-@@ -27353,11 +27356,17 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#else
- int foo (int x) __attribute__ ((const));
-+#endif
- int
- main ()
- {
--
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#endif
-   ;
-   return 0;
- }
-@@ -27406,7 +27415,11 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.c <<EOF
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#else
- void *foo (int x) __attribute__ ((malloc));
-+#endif
- EOF
- gmp_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >conftest.out 2>&1"
- if { (eval echo "$as_me:$LINENO: \"$gmp_compile\"") >&5
-@@ -27447,13 +27460,19 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#else
- typedef int SItype __attribute__ ((mode (SI)));
-+#endif
- int
- main ()
- {
--
--  ;
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#else
-   return 0;
-+  #endif
- }
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -27505,13 +27524,20 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#else
- void foo (int x) __attribute__ ((noreturn));
-+#endif
- int
- main ()
- {
--
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "No attribute support for Sun compilers."
-+#else
-   ;
-   return 0;
-+#endif
- }
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -34385,7 +34411,7 @@
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
-+  echo "#! /bin/bash" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--- a/components/gnump/patches/007-Makefile.in.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- Makefile.in	2010-01-07 12:09:42.000000000 -0800
-+++ Makefile.in	2010-11-12 11:51:46.819919916 -0800
-@@ -300,7 +300,7 @@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBCURSES = @LIBCURSES@
--LIBGMPXX_LDFLAGS = @LIBGMPXX_LDFLAGS@
-+LIBGMPXX_LDFLAGS = @LIBGMPXX_LDFLAGS@ $(LDFLAGS) -lCrun -lCstd
- LIBGMP_DLL = @LIBGMP_DLL@
- LIBGMP_LDFLAGS = @LIBGMP_LDFLAGS@
- LIBM = @LIBM@
--- a/components/gnump/patches/008-ismpz.cc.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- cxx/ismpz.cc.orig	2007-09-01 03:09:03.000000000 -0700
-+++ cxx/ismpz.cc	2008-04-18 10:06:50.866243982 -0700
-@@ -20,11 +20,11 @@
- #include <cctype>
- #include <iostream>
- #include <string>
--#include "gmp.h"
--#include "gmp-impl.h"
--
-+#include <clocale>
- using namespace std;
- 
-+#include "gmp.h"
-+#include "gmp-impl.h"
- 
- // For g++ libstdc++ parsing see num_get<chartype,initer>::_M_extract_int in
- // include/bits/locale_facets.tcc.
-@@ -38,7 +38,12 @@
-   if (i.flags() & ios::skipws) // skip initial whitespace
-     {
- #if HAVE_STD__LOCALE
--      const ctype<char>& ct = use_facet< ctype<char> >(i.getloc());
-+      const ctype<char>& ct =
-+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
-+	use_facet< ctype<char> >(i.getloc());
-+#else
-+	use_facet(i.getloc(),(ctype<char>*)0);
-+#endif
- #define cxx_isspace(c)  (ct.is(ctype_base::space,(c)))
- #else
- #define cxx_isspace(c)  isspace(c)
--- a/components/gnump/patches/009-ismpf.cc.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
---- cxx/ismpf.cc.orig	2007-09-01 03:09:03.000000000 -0700
-+++ cxx/ismpf.cc	2008-04-18 10:10:34.840332673 -0700
-@@ -21,13 +21,11 @@
- #include <iostream>
- #include <string>
- #include <clocale>    // for localeconv
-+using namespace std;
- 
- #include "gmp.h"
- #include "gmp-impl.h"
- 
--using namespace std;
--
--
- // For g++ libstdc++ parsing see num_get<chartype,initer>::_M_extract_float
- // in include/bits/locale_facets.tcc.
- //
-@@ -50,7 +48,13 @@
-   // C++ decimal point
- #if HAVE_STD__LOCALE
-   const locale& loc = i.getloc();
--  char point_char = use_facet< numpunct<char> >(loc).decimal_point();
-+  char point_char =
-+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
-+      use_facet< numpunct<char> >(loc)
-+#else
-+      use_facet(loc,(numpunct<char>*)0)
-+#endif
-+      .decimal_point();
- #else
-   const char *point = lconv_point;
-   char point_char = *point;
-@@ -62,7 +66,12 @@
-     {
-       // C++ isspace
- #if HAVE_STD__LOCALE
--      const ctype<char>& ct = use_facet< ctype<char> >(loc);
-+      const ctype<char>& ct =
-+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
-+	use_facet< ctype<char> >(loc);
-+#else
-+	use_facet(loc,(ctype<char>*)0);
-+#endif
- #define cxx_isspace(c)  (ct.is(ctype_base::space,(c)))
- #else
- #define cxx_isspace(c)  isspace(c)
--- a/components/gnump/patches/010-osmpf.cc.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
---- cxx/osmpf.cc.orig	2007-09-01 03:09:03.000000000 -0700
-+++ cxx/osmpf.cc	2008-04-18 10:08:31.565184503 -0700
-@@ -19,15 +19,14 @@
- 
- #include <clocale>
- #include <iostream>
-+using namespace std;
-+
- #include <stdarg.h>    /* for va_list and hence doprnt_funs_t */
- #include <string.h>
- 
- #include "gmp.h"
- #include "gmp-impl.h"
- 
--using namespace std;
--
--
- /* The gmp_asprintf support routines never give an error, so
-    __gmp_doprnt_mpf shouldn't fail and it's return can just be checked with
-    an ASSERT.  */
-@@ -44,7 +43,14 @@
- 
- #if HAVE_STD__LOCALE
-   char  point[2];
--  point[0] = use_facet< numpunct<char> >(o.getloc()).decimal_point();
-+  point[0] =
-+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
-+      use_facet< numpunct<char> >(o.getloc())
-+#else
-+      use_facet(o.getloc(),(numpunct<char>*)0)
-+#endif
-+      .decimal_point();
-+
-   point[1] = '\0';
- #else
-   const char *point = localeconv()->decimal_point;
--- a/components/gnump/patches/011-assert.c.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- assert.c.orig	2007-08-30 11:31:40.000000000 -0700
-+++ assert.c	2008-04-18 17:08:25.166351451 -0700
-@@ -23,9 +23,6 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include "gmp.h"
--#include "gmp-impl.h"
--
- 
- void
- __gmp_assert_header (const char *filename, int linenum)
--- a/components/gnump/patches/012-gen-fib.c.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gen-fib.c	2010-01-07 12:09:02.000000000 -0800
-+++ gen-fib.c	2011-05-02 12:12:20.321335724 -0700
-@@ -72,7 +72,7 @@
-   printf ("/* This file generated by gen-fib.c - DO NOT EDIT. */\n");
-   printf ("\n");
-   printf ("#if GMP_NUMB_BITS != %d\n", numb_bits);
--  printf ("Error, error, this data is for %d bits\n", numb_bits);
-+  printf ("#error \"this data is for %d bits\"\n", numb_bits);
-   printf ("#endif\n");
-   printf ("\n");
-   printf ("#define FIB_TABLE_LIMIT         %d\n", fib_limit);
--- a/components/gnump/patches/013-config.guess.patch	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- config.guess	Fri Jul 27 15:47:30 2012
-+++ config.guess	Fri Jul 27 15:47:40 2012
-@@ -661,7 +661,7 @@
-   if test -z "$exact_cpu"; then
-     case `uname -m` in
-       sun4[md]) exact_cpu=sparcv8 ;;
--      sun4u)    exact_cpu=sparcv9 ;;
-+      sun4[uv])    exact_cpu=sparcv9 ;;
-     esac
-   fi
-   ;;
--- a/components/gnump/test/results-32.master	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-make: Entering directory `$(@D)'
-/usr/gnu/bin/make  check-recursive
-make: Entering directory `$(@D)'
-Making check in tests
-make: Entering directory `$(@D)/tests'
-Making check in .
-make: Entering directory `$(@D)/tests'
-/usr/gnu/bin/make  libtests.la t-bswap t-constants t-count_zeros t-gmpmax t-hightomask t-modlinv t-popc t-parity t-sub
-make: Entering directory `$(@D)/tests'
-mkdir .libs
-ranlib .libs/libtests.a
-(cd .libs && rm -f libtests.la && ln -s ../libtests.la libtests.la)
-make: Leaving directory `$(@D)/tests'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests'
-PASS: t-bswap
-PASS: t-constants
-PASS: t-count_zeros
-PASS: t-gmpmax
-PASS: t-hightomask
-PASS: t-modlinv
-PASS: t-popc
-PASS: t-parity
-PASS: t-sub
-==================
-All 9 tests passed
-==================
-make: Leaving directory `$(@D)/tests'
-make: Leaving directory `$(@D)/tests'
-Making check in devel
-make: Entering directory `$(@D)/tests/devel'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/tests/devel'
-Making check in mpn
-make: Entering directory `$(@D)/tests/mpn'
-/usr/gnu/bin/make  t-asmtype t-aors_1 t-divrem_1 t-fat t-get_d t-instrument t-iord_u t-mp_bases t-perfsqr t-scan t-hgcd t-matrix22
-make: Entering directory `$(@D)/tests/mpn'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpn'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpn'
-PASS: t-asmtype
-PASS: t-aors_1
-PASS: t-divrem_1
-PASS: t-fat
-PASS: t-get_d
-PASS: t-instrument
-PASS: t-iord_u
-PASS: t-mp_bases
-PASS: t-perfsqr
-PASS: t-scan
-PASS: t-hgcd
-PASS: t-matrix22
-===================
-All 12 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpn'
-make: Leaving directory `$(@D)/tests/mpn'
-Making check in mpz
-make: Entering directory `$(@D)/tests/mpz'
-/usr/gnu/bin/make  t-addsub t-cmp t-mul t-mul_i t-tdiv t-tdiv_ui t-fdiv t-fdiv_ui t-cdiv_ui t-gcd t-gcd_ui t-lcm dive dive_ui t-sqrtrem convert io t-inp_str logic bit t-powm t-powm_ui t-pow t-div_2exp reuse t-root t-perfsqr t-perfpow t-jac t-bin t-get_d t-get_d_2exp t-get_si t-set_d t-set_si t-fac_ui t-fib_ui t-lucnum_ui t-scan t-fits t-divis t-divis_2exp t-cong t-cong_2exp t-sizeinbase t-set_str t-aorsmul t-cmp_d t-cmp_si t-hamdist t-oddeven t-popcount t-set_f t-io_raw t-import t-export t-pprime_p t-nextprime
-make: Entering directory `$(@D)/tests/mpz'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpz'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpz'
-PASS: t-addsub
-PASS: t-cmp
-PASS: t-mul
-PASS: t-mul_i
-PASS: t-tdiv
-PASS: t-tdiv_ui
-PASS: t-fdiv
-PASS: t-fdiv_ui
-PASS: t-cdiv_ui
-PASS: t-gcd
-PASS: t-gcd_ui
-PASS: t-lcm
-PASS: dive
-PASS: dive_ui
-PASS: t-sqrtrem
-PASS: convert
-PASS: io
-PASS: t-inp_str
-PASS: logic
-PASS: bit
-PASS: t-powm
-PASS: t-powm_ui
-PASS: t-pow
-PASS: t-div_2exp
-PASS: reuse
-PASS: t-root
-PASS: t-perfsqr
-PASS: t-perfpow
-PASS: t-jac
-PASS: t-bin
-PASS: t-get_d
-PASS: t-get_d_2exp
-PASS: t-get_si
-PASS: t-set_d
-PASS: t-set_si
-PASS: t-fac_ui
-PASS: t-fib_ui
-PASS: t-lucnum_ui
-PASS: t-scan
-PASS: t-fits
-PASS: t-divis
-PASS: t-divis_2exp
-PASS: t-cong
-PASS: t-cong_2exp
-PASS: t-sizeinbase
-PASS: t-set_str
-PASS: t-aorsmul
-PASS: t-cmp_d
-PASS: t-cmp_si
-PASS: t-hamdist
-PASS: t-oddeven
-PASS: t-popcount
-PASS: t-set_f
-PASS: t-io_raw
-PASS: t-import
-PASS: t-export
-PASS: t-pprime_p
-PASS: t-nextprime
-===================
-All 58 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpz'
-make: Leaving directory `$(@D)/tests/mpz'
-Making check in mpq
-make: Entering directory `$(@D)/tests/mpq'
-/usr/gnu/bin/make  t-aors t-cmp t-cmp_ui t-cmp_si t-equal t-get_d t-get_str t-inp_str t-md_2exp t-set_f t-set_str
-make: Entering directory `$(@D)/tests/mpq'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpq'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpq'
-PASS: t-aors
-PASS: t-cmp
-PASS: t-cmp_ui
-PASS: t-cmp_si
-PASS: t-equal
-PASS: t-get_d
-PASS: t-get_str
-PASS: t-inp_str
-PASS: t-md_2exp
-PASS: t-set_f
-PASS: t-set_str
-===================
-All 11 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpq'
-make: Leaving directory `$(@D)/tests/mpq'
-Making check in mpf
-make: Entering directory `$(@D)/tests/mpf'
-/usr/gnu/bin/make  t-add t-sub t-conv t-sqrt t-sqrt_ui t-muldiv t-dm2exp reuse t-cmp_d t-cmp_si t-div t-fits t-get_d t-get_d_2exp t-get_si t-get_ui t-gsprec t-inp_str t-int_p t-mul_ui t-set t-set_q t-set_si t-set_ui t-trunc t-ui_div
-make: Entering directory `$(@D)/tests/mpf'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpf'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpf'
-PASS: t-add
-PASS: t-sub
-PASS: t-conv
-PASS: t-sqrt
-PASS: t-sqrt_ui
-PASS: t-muldiv
-PASS: t-dm2exp
-PASS: reuse
-PASS: t-cmp_d
-PASS: t-cmp_si
-PASS: t-div
-PASS: t-fits
-PASS: t-get_d
-PASS: t-get_d_2exp
-PASS: t-get_si
-PASS: t-get_ui
-PASS: t-gsprec
-PASS: t-inp_str
-PASS: t-int_p
-PASS: t-mul_ui
-PASS: t-set
-PASS: t-set_q
-PASS: t-set_si
-PASS: t-set_ui
-PASS: t-trunc
-PASS: t-ui_div
-===================
-All 26 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpf'
-make: Leaving directory `$(@D)/tests/mpf'
-Making check in rand
-make: Entering directory `$(@D)/tests/rand'
-/usr/gnu/bin/make  t-iset t-lc2exp t-mt t-rand t-urbui t-urmui t-urndmm
-make: Entering directory `$(@D)/tests/rand'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/rand'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/rand'
-PASS: t-iset
-PASS: t-lc2exp
-PASS: t-mt
-PASS: t-rand
-PASS: t-urbui
-PASS: t-urmui
-PASS: t-urndmm
-==================
-All 7 tests passed
-==================
-make: Leaving directory `$(@D)/tests/rand'
-make: Leaving directory `$(@D)/tests/rand'
-Making check in misc
-make: Entering directory `$(@D)/tests/misc'
-/usr/gnu/bin/make  t-printf t-scanf t-locale
-make: Entering directory `$(@D)/tests/misc'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/misc'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/misc'
-PASS: t-printf
-PASS: t-scanf
-Test skipped, replacing localeconv/nl_langinfo doesn't work
-PASS: t-locale
-==================
-All 3 tests passed
-==================
-make: Leaving directory `$(@D)/tests/misc'
-make: Leaving directory `$(@D)/tests/misc'
-Making check in cxx
-make: Entering directory `$(@D)/tests/cxx'
-/usr/gnu/bin/make  t-assign t-binary t-cast t-constr t-headers t-istream t-locale t-misc t-ops t-ostream t-prec t-rand t-ternary t-unary
-make: Entering directory `$(@D)/tests/cxx'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/cxx'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/cxx'
-PASS: t-assign
-PASS: t-binary
-PASS: t-cast
-PASS: t-constr
-PASS: t-headers
-PASS: t-istream
-PASS: t-locale
-PASS: t-misc
-PASS: t-ops
-PASS: t-ostream
-PASS: t-prec
-PASS: t-rand
-PASS: t-ternary
-PASS: t-unary
-===================
-All 14 tests passed
-===================
-make: Leaving directory `$(@D)/tests/cxx'
-make: Leaving directory `$(@D)/tests/cxx'
-Making check in mpbsd
-make: Entering directory `$(@D)/tests/mpbsd'
-/usr/gnu/bin/make  allfuns t-itom t-mtox
-make: Entering directory `$(@D)/tests/mpbsd'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpbsd'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpbsd'
-PASS: allfuns
-PASS: t-itom
-Skipping t-mtox, cannot test libgmp and libmp memory together
-PASS: t-mtox
-==================
-All 3 tests passed
-==================
-make: Leaving directory `$(@D)/tests/mpbsd'
-make: Leaving directory `$(@D)/tests/mpbsd'
-make: Leaving directory `$(@D)/tests'
-Making check in mpn
-make: Entering directory `$(@D)/mpn'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpn'
-Making check in mpz
-make: Entering directory `$(@D)/mpz'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpz'
-Making check in mpq
-make: Entering directory `$(@D)/mpq'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpq'
-Making check in mpf
-make: Entering directory `$(@D)/mpf'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpf'
-Making check in printf
-make: Entering directory `$(@D)/printf'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/printf'
-Making check in scanf
-make: Entering directory `$(@D)/scanf'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/scanf'
-Making check in cxx
-make: Entering directory `$(@D)/cxx'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/cxx'
-Making check in mpbsd
-make: Entering directory `$(@D)/mpbsd'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpbsd'
-Making check in demos
-make: Entering directory `$(@D)/demos'
-Making check in calc
-make: Entering directory `$(@D)/demos/calc'
-/usr/gnu/bin/make  check-am
-make: Entering directory `$(@D)/demos/calc'
-make: Nothing to be done for `check-am'.
-make: Leaving directory `$(@D)/demos/calc'
-make: Leaving directory `$(@D)/demos/calc'
-Making check in expr
-make: Entering directory `$(@D)/demos/expr'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/demos/expr'
-make: Entering directory `$(@D)/demos'
-make: Nothing to be done for `check-am'.
-make: Leaving directory `$(@D)/demos'
-make: Leaving directory `$(@D)/demos'
-Making check in tune
-make: Entering directory `$(@D)/tune'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/tune'
-Making check in doc
-make: Entering directory `$(@D)/doc'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/doc'
-make: Entering directory `$(@D)'
-make: Leaving directory `$(@D)'
-make: Leaving directory `$(@D)'
-make: Leaving directory `$(@D)'
--- a/components/gnump/test/results-64.master	Wed Mar 29 02:34:39 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-make: Entering directory `$(@D)'
-/usr/gnu/bin/make  check-recursive
-make: Entering directory `$(@D)'
-Making check in tests
-make: Entering directory `$(@D)/tests'
-Making check in .
-make: Entering directory `$(@D)/tests'
-/usr/gnu/bin/make  libtests.la t-bswap t-constants t-count_zeros t-gmpmax t-hightomask t-modlinv t-popc t-parity t-sub
-make: Entering directory `$(@D)/tests'
-mkdir .libs
-ranlib .libs/libtests.a
-(cd .libs && rm -f libtests.la && ln -s ../libtests.la libtests.la)
-make: Leaving directory `$(@D)/tests'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests'
-PASS: t-bswap
-PASS: t-constants
-PASS: t-count_zeros
-PASS: t-gmpmax
-PASS: t-hightomask
-PASS: t-modlinv
-PASS: t-popc
-PASS: t-parity
-PASS: t-sub
-==================
-All 9 tests passed
-==================
-make: Leaving directory `$(@D)/tests'
-make: Leaving directory `$(@D)/tests'
-Making check in devel
-make: Entering directory `$(@D)/tests/devel'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/tests/devel'
-Making check in mpn
-make: Entering directory `$(@D)/tests/mpn'
-/usr/gnu/bin/make  t-asmtype t-aors_1 t-divrem_1 t-fat t-get_d t-instrument t-iord_u t-mp_bases t-perfsqr t-scan t-hgcd t-matrix22
-make: Entering directory `$(@D)/tests/mpn'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpn'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpn'
-PASS: t-asmtype
-PASS: t-aors_1
-PASS: t-divrem_1
-PASS: t-fat
-PASS: t-get_d
-PASS: t-instrument
-PASS: t-iord_u
-PASS: t-mp_bases
-PASS: t-perfsqr
-PASS: t-scan
-PASS: t-hgcd
-PASS: t-matrix22
-===================
-All 12 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpn'
-make: Leaving directory `$(@D)/tests/mpn'
-Making check in mpz
-make: Entering directory `$(@D)/tests/mpz'
-/usr/gnu/bin/make  t-addsub t-cmp t-mul t-mul_i t-tdiv t-tdiv_ui t-fdiv t-fdiv_ui t-cdiv_ui t-gcd t-gcd_ui t-lcm dive dive_ui t-sqrtrem convert io t-inp_str logic bit t-powm t-powm_ui t-pow t-div_2exp reuse t-root t-perfsqr t-perfpow t-jac t-bin t-get_d t-get_d_2exp t-get_si t-set_d t-set_si t-fac_ui t-fib_ui t-lucnum_ui t-scan t-fits t-divis t-divis_2exp t-cong t-cong_2exp t-sizeinbase t-set_str t-aorsmul t-cmp_d t-cmp_si t-hamdist t-oddeven t-popcount t-set_f t-io_raw t-import t-export t-pprime_p t-nextprime
-make: Entering directory `$(@D)/tests/mpz'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpz'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpz'
-PASS: t-addsub
-PASS: t-cmp
-PASS: t-mul
-PASS: t-mul_i
-PASS: t-tdiv
-PASS: t-tdiv_ui
-PASS: t-fdiv
-PASS: t-fdiv_ui
-PASS: t-cdiv_ui
-PASS: t-gcd
-PASS: t-gcd_ui
-PASS: t-lcm
-PASS: dive
-PASS: dive_ui
-PASS: t-sqrtrem
-PASS: convert
-PASS: io
-PASS: t-inp_str
-PASS: logic
-PASS: bit
-PASS: t-powm
-PASS: t-powm_ui
-PASS: t-pow
-PASS: t-div_2exp
-PASS: reuse
-PASS: t-root
-PASS: t-perfsqr
-PASS: t-perfpow
-PASS: t-jac
-PASS: t-bin
-PASS: t-get_d
-PASS: t-get_d_2exp
-PASS: t-get_si
-PASS: t-set_d
-PASS: t-set_si
-PASS: t-fac_ui
-PASS: t-fib_ui
-PASS: t-lucnum_ui
-PASS: t-scan
-PASS: t-fits
-PASS: t-divis
-PASS: t-divis_2exp
-PASS: t-cong
-PASS: t-cong_2exp
-PASS: t-sizeinbase
-PASS: t-set_str
-PASS: t-aorsmul
-PASS: t-cmp_d
-PASS: t-cmp_si
-PASS: t-hamdist
-PASS: t-oddeven
-PASS: t-popcount
-PASS: t-set_f
-PASS: t-io_raw
-PASS: t-import
-PASS: t-export
-PASS: t-pprime_p
-PASS: t-nextprime
-===================
-All 58 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpz'
-make: Leaving directory `$(@D)/tests/mpz'
-Making check in mpq
-make: Entering directory `$(@D)/tests/mpq'
-/usr/gnu/bin/make  t-aors t-cmp t-cmp_ui t-cmp_si t-equal t-get_d t-get_str t-inp_str t-md_2exp t-set_f t-set_str
-make: Entering directory `$(@D)/tests/mpq'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpq'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpq'
-PASS: t-aors
-PASS: t-cmp
-PASS: t-cmp_ui
-PASS: t-cmp_si
-PASS: t-equal
-PASS: t-get_d
-PASS: t-get_str
-PASS: t-inp_str
-PASS: t-md_2exp
-PASS: t-set_f
-PASS: t-set_str
-===================
-All 11 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpq'
-make: Leaving directory `$(@D)/tests/mpq'
-Making check in mpf
-make: Entering directory `$(@D)/tests/mpf'
-/usr/gnu/bin/make  t-add t-sub t-conv t-sqrt t-sqrt_ui t-muldiv t-dm2exp reuse t-cmp_d t-cmp_si t-div t-fits t-get_d t-get_d_2exp t-get_si t-get_ui t-gsprec t-inp_str t-int_p t-mul_ui t-set t-set_q t-set_si t-set_ui t-trunc t-ui_div
-make: Entering directory `$(@D)/tests/mpf'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpf'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpf'
-PASS: t-add
-PASS: t-sub
-PASS: t-conv
-PASS: t-sqrt
-PASS: t-sqrt_ui
-PASS: t-muldiv
-PASS: t-dm2exp
-PASS: reuse
-PASS: t-cmp_d
-PASS: t-cmp_si
-PASS: t-div
-PASS: t-fits
-PASS: t-get_d
-PASS: t-get_d_2exp
-PASS: t-get_si
-PASS: t-get_ui
-PASS: t-gsprec
-PASS: t-inp_str
-PASS: t-int_p
-PASS: t-mul_ui
-PASS: t-set
-PASS: t-set_q
-PASS: t-set_si
-PASS: t-set_ui
-PASS: t-trunc
-PASS: t-ui_div
-===================
-All 26 tests passed
-===================
-make: Leaving directory `$(@D)/tests/mpf'
-make: Leaving directory `$(@D)/tests/mpf'
-Making check in rand
-make: Entering directory `$(@D)/tests/rand'
-/usr/gnu/bin/make  t-iset t-lc2exp t-mt t-rand t-urbui t-urmui t-urndmm
-make: Entering directory `$(@D)/tests/rand'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/rand'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/rand'
-PASS: t-iset
-PASS: t-lc2exp
-PASS: t-mt
-PASS: t-rand
-PASS: t-urbui
-PASS: t-urmui
-PASS: t-urndmm
-==================
-All 7 tests passed
-==================
-make: Leaving directory `$(@D)/tests/rand'
-make: Leaving directory `$(@D)/tests/rand'
-Making check in misc
-make: Entering directory `$(@D)/tests/misc'
-/usr/gnu/bin/make  t-printf t-scanf t-locale
-make: Entering directory `$(@D)/tests/misc'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/misc'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/misc'
-PASS: t-printf
-PASS: t-scanf
-Test skipped, replacing localeconv/nl_langinfo doesn't work
-PASS: t-locale
-==================
-All 3 tests passed
-==================
-make: Leaving directory `$(@D)/tests/misc'
-make: Leaving directory `$(@D)/tests/misc'
-Making check in cxx
-make: Entering directory `$(@D)/tests/cxx'
-/usr/gnu/bin/make  t-assign t-binary t-cast t-constr t-headers t-istream t-locale t-misc t-ops t-ostream t-prec t-rand t-ternary t-unary
-make: Entering directory `$(@D)/tests/cxx'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/cxx'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/cxx'
-PASS: t-assign
-PASS: t-binary
-PASS: t-cast
-PASS: t-constr
-PASS: t-headers
-PASS: t-istream
-PASS: t-locale
-PASS: t-misc
-PASS: t-ops
-PASS: t-ostream
-PASS: t-prec
-PASS: t-rand
-PASS: t-ternary
-PASS: t-unary
-===================
-All 14 tests passed
-===================
-make: Leaving directory `$(@D)/tests/cxx'
-make: Leaving directory `$(@D)/tests/cxx'
-Making check in mpbsd
-make: Entering directory `$(@D)/tests/mpbsd'
-/usr/gnu/bin/make  allfuns t-itom t-mtox
-make: Entering directory `$(@D)/tests/mpbsd'
-mkdir .libs
-make: Leaving directory `$(@D)/tests/mpbsd'
-/usr/gnu/bin/make  check-TESTS
-make: Entering directory `$(@D)/tests/mpbsd'
-PASS: allfuns
-PASS: t-itom
-Skipping t-mtox, cannot test libgmp and libmp memory together
-PASS: t-mtox
-==================
-All 3 tests passed
-==================
-make: Leaving directory `$(@D)/tests/mpbsd'
-make: Leaving directory `$(@D)/tests/mpbsd'
-make: Leaving directory `$(@D)/tests'
-Making check in mpn
-make: Entering directory `$(@D)/mpn'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpn'
-Making check in mpz
-make: Entering directory `$(@D)/mpz'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpz'
-Making check in mpq
-make: Entering directory `$(@D)/mpq'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpq'
-Making check in mpf
-make: Entering directory `$(@D)/mpf'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpf'
-Making check in printf
-make: Entering directory `$(@D)/printf'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/printf'
-Making check in scanf
-make: Entering directory `$(@D)/scanf'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/scanf'
-Making check in cxx
-make: Entering directory `$(@D)/cxx'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/cxx'
-Making check in mpbsd
-make: Entering directory `$(@D)/mpbsd'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/mpbsd'
-Making check in demos
-make: Entering directory `$(@D)/demos'
-Making check in calc
-make: Entering directory `$(@D)/demos/calc'
-/usr/gnu/bin/make  check-am
-make: Entering directory `$(@D)/demos/calc'
-make: Nothing to be done for `check-am'.
-make: Leaving directory `$(@D)/demos/calc'
-make: Leaving directory `$(@D)/demos/calc'
-Making check in expr
-make: Entering directory `$(@D)/demos/expr'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/demos/expr'
-make: Entering directory `$(@D)/demos'
-make: Nothing to be done for `check-am'.
-make: Leaving directory `$(@D)/demos'
-make: Leaving directory `$(@D)/demos'
-Making check in tune
-make: Entering directory `$(@D)/tune'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/tune'
-Making check in doc
-make: Entering directory `$(@D)/doc'
-make: Nothing to be done for `check'.
-make: Leaving directory `$(@D)/doc'
-make: Entering directory `$(@D)'
-make: Leaving directory `$(@D)'
-make: Leaving directory `$(@D)'
-make: Leaving directory `$(@D)'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnump/test/results-all.master	Thu Mar 30 08:44:01 2017 -0700
@@ -0,0 +1,372 @@
+make: Entering directory '$(@D)'
+make: Entering directory '$(@D)/tests'
+make: Entering directory '$(@D)/tests'
+make: Entering directory '$(@D)/tests'
+make: Leaving directory '$(@D)/tests'
+make: Entering directory '$(@D)/tests'
+make: Entering directory '$(@D)/tests'
+PASS: t-bswap
+PASS: t-constants
+PASS: t-count_zeros
+PASS: t-hightomask
+PASS: t-modlinv
+PASS: t-popc
+PASS: t-parity
+PASS: t-sub
+============================================================================
+============================================================================
+# TOTAL: 8
+# PASS:  8
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests'
+make: Leaving directory '$(@D)/tests'
+make: Leaving directory '$(@D)/tests'
+make: Entering directory '$(@D)/tests/devel'
+make: Leaving directory '$(@D)/tests/devel'
+make: Entering directory '$(@D)/tests/mpn'
+make: Entering directory '$(@D)/tests/mpn'
+make: Leaving directory '$(@D)/tests/mpn'
+make: Entering directory '$(@D)/tests/mpn'
+make: Entering directory '$(@D)/tests/mpn'
+PASS: t-asmtype
+PASS: t-aors_1
+PASS: t-divrem_1
+PASS: t-mod_1
+PASS: t-fat
+PASS: t-get_d
+PASS: t-instrument
+PASS: t-iord_u
+PASS: t-mp_bases
+PASS: t-perfsqr
+PASS: t-scan
+PASS: logic
+PASS: t-toom22
+PASS: t-toom32
+PASS: t-toom33
+PASS: t-toom42
+PASS: t-toom43
+PASS: t-toom44
+PASS: t-toom52
+PASS: t-toom53
+PASS: t-toom54
+PASS: t-toom62
+PASS: t-toom63
+PASS: t-toom6h
+PASS: t-toom8h
+PASS: t-toom2-sqr
+PASS: t-toom3-sqr
+PASS: t-toom4-sqr
+PASS: t-toom6-sqr
+PASS: t-toom8-sqr
+PASS: t-div
+PASS: t-mul
+PASS: t-mullo
+PASS: t-sqrlo
+PASS: t-mulmod_bnm1
+PASS: t-sqrmod_bnm1
+PASS: t-mulmid
+PASS: t-hgcd
+PASS: t-hgcd_appr
+PASS: t-matrix22
+PASS: t-invert
+PASS: t-bdiv
+PASS: t-broot
+PASS: t-brootinv
+PASS: t-minvert
+PASS: t-sizeinbase
+============================================================================
+============================================================================
+# TOTAL: 46
+# PASS:  46
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/mpn'
+make: Leaving directory '$(@D)/tests/mpn'
+make: Leaving directory '$(@D)/tests/mpn'
+make: Entering directory '$(@D)/tests/mpz'
+make: Entering directory '$(@D)/tests/mpz'
+make: Leaving directory '$(@D)/tests/mpz'
+make: Entering directory '$(@D)/tests/mpz'
+make: Entering directory '$(@D)/tests/mpz'
+PASS: reuse
+PASS: t-addsub
+PASS: t-cmp
+PASS: t-mul
+PASS: t-mul_i
+PASS: t-tdiv
+PASS: t-tdiv_ui
+PASS: t-fdiv
+PASS: t-fdiv_ui
+PASS: t-cdiv_ui
+PASS: t-gcd
+PASS: t-gcd_ui
+PASS: t-lcm
+PASS: t-invert
+PASS: dive
+PASS: dive_ui
+PASS: t-sqrtrem
+PASS: convert
+PASS: io
+PASS: t-inp_str
+PASS: logic
+PASS: bit
+PASS: t-powm
+PASS: t-powm_ui
+PASS: t-pow
+PASS: t-div_2exp
+PASS: t-root
+PASS: t-perfsqr
+PASS: t-perfpow
+PASS: t-jac
+PASS: t-bin
+PASS: t-get_d
+PASS: t-get_d_2exp
+PASS: t-get_si
+PASS: t-set_d
+PASS: t-set_si
+PASS: t-fac_ui
+PASS: t-mfac_uiui
+PASS: t-primorial_ui
+PASS: t-fib_ui
+PASS: t-lucnum_ui
+PASS: t-scan
+PASS: t-fits
+PASS: t-divis
+PASS: t-divis_2exp
+PASS: t-cong
+PASS: t-cong_2exp
+PASS: t-sizeinbase
+PASS: t-set_str
+PASS: t-aorsmul
+PASS: t-cmp_d
+PASS: t-cmp_si
+PASS: t-hamdist
+PASS: t-oddeven
+PASS: t-popcount
+PASS: t-set_f
+PASS: t-io_raw
+PASS: t-import
+PASS: t-export
+PASS: t-pprime_p
+PASS: t-nextprime
+PASS: t-remove
+PASS: t-limbs
+============================================================================
+============================================================================
+# TOTAL: 63
+# PASS:  63
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/mpz'
+make: Leaving directory '$(@D)/tests/mpz'
+make: Leaving directory '$(@D)/tests/mpz'
+make: Entering directory '$(@D)/tests/mpq'
+make: Entering directory '$(@D)/tests/mpq'
+make: Leaving directory '$(@D)/tests/mpq'
+make: Entering directory '$(@D)/tests/mpq'
+make: Entering directory '$(@D)/tests/mpq'
+PASS: t-aors
+PASS: t-cmp
+PASS: t-cmp_ui
+PASS: t-cmp_si
+PASS: t-equal
+PASS: t-get_d
+PASS: t-get_str
+PASS: t-inp_str
+PASS: t-inv
+PASS: t-md_2exp
+PASS: t-set_f
+PASS: t-set_str
+PASS: io
+PASS: reuse
+PASS: t-cmp_z
+============================================================================
+============================================================================
+# TOTAL: 15
+# PASS:  15
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/mpq'
+make: Leaving directory '$(@D)/tests/mpq'
+make: Leaving directory '$(@D)/tests/mpq'
+make: Entering directory '$(@D)/tests/mpf'
+make: Entering directory '$(@D)/tests/mpf'
+make: Leaving directory '$(@D)/tests/mpf'
+make: Entering directory '$(@D)/tests/mpf'
+make: Entering directory '$(@D)/tests/mpf'
+PASS: t-dm2exp
+PASS: t-conv
+PASS: t-add
+PASS: t-sub
+PASS: t-sqrt
+PASS: t-sqrt_ui
+PASS: t-muldiv
+PASS: reuse
+PASS: t-cmp_d
+PASS: t-cmp_si
+PASS: t-div
+PASS: t-fits
+PASS: t-get_d
+PASS: t-get_d_2exp
+PASS: t-get_si
+PASS: t-get_ui
+PASS: t-gsprec
+PASS: t-inp_str
+PASS: t-int_p
+PASS: t-mul_ui
+PASS: t-set
+PASS: t-set_q
+PASS: t-set_si
+PASS: t-set_ui
+PASS: t-trunc
+PASS: t-ui_div
+PASS: t-eq
+PASS: t-pow_ui
+============================================================================
+============================================================================
+# TOTAL: 28
+# PASS:  28
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/mpf'
+make: Leaving directory '$(@D)/tests/mpf'
+make: Leaving directory '$(@D)/tests/mpf'
+make: Entering directory '$(@D)/tests/rand'
+make: Entering directory '$(@D)/tests/rand'
+make: Leaving directory '$(@D)/tests/rand'
+make: Entering directory '$(@D)/tests/rand'
+make: Entering directory '$(@D)/tests/rand'
+PASS: t-iset
+PASS: t-lc2exp
+PASS: t-mt
+PASS: t-rand
+PASS: t-urbui
+PASS: t-urmui
+PASS: t-urndmm
+============================================================================
+============================================================================
+# TOTAL: 7
+# PASS:  7
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/rand'
+make: Leaving directory '$(@D)/tests/rand'
+make: Leaving directory '$(@D)/tests/rand'
+make: Entering directory '$(@D)/tests/misc'
+make: Entering directory '$(@D)/tests/misc'
+make: Leaving directory '$(@D)/tests/misc'
+make: Entering directory '$(@D)/tests/misc'
+make: Entering directory '$(@D)/tests/misc'
+PASS: t-printf
+PASS: t-scanf
+PASS: t-locale
+============================================================================
+============================================================================
+# TOTAL: 3
+# PASS:  3
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/misc'
+make: Leaving directory '$(@D)/tests/misc'
+make: Leaving directory '$(@D)/tests/misc'
+make: Entering directory '$(@D)/tests/cxx'
+make: Entering directory '$(@D)/tests/cxx'
+make: Leaving directory '$(@D)/tests/cxx'
+make: Entering directory '$(@D)/tests/cxx'
+make: Entering directory '$(@D)/tests/cxx'
+PASS: t-binary
+PASS: t-cast
+PASS: t-cxx11
+PASS: t-headers
+PASS: t-iostream
+PASS: t-istream
+PASS: t-locale
+PASS: t-misc
+PASS: t-mix
+PASS: t-ops
+PASS: t-ops2
+PASS: t-ops3
+PASS: t-ostream
+PASS: t-prec
+PASS: t-ternary
+PASS: t-unary
+PASS: t-do-exceptions-work-at-all-with-this-compiler
+PASS: t-assign
+PASS: t-constr
+PASS: t-rand
+============================================================================
+============================================================================
+# TOTAL: 20
+# PASS:  20
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make: Leaving directory '$(@D)/tests/cxx'
+make: Leaving directory '$(@D)/tests/cxx'
+make: Leaving directory '$(@D)/tests/cxx'
+make: Leaving directory '$(@D)/tests'
+make: Entering directory '$(@D)/mpn'
+make: Leaving directory '$(@D)/mpn'
+make: Entering directory '$(@D)/mpz'
+make: Leaving directory '$(@D)/mpz'
+make: Entering directory '$(@D)/mpq'
+make: Leaving directory '$(@D)/mpq'
+make: Entering directory '$(@D)/mpf'
+make: Leaving directory '$(@D)/mpf'
+make: Entering directory '$(@D)/printf'
+make: Leaving directory '$(@D)/printf'
+make: Entering directory '$(@D)/scanf'
+make: Leaving directory '$(@D)/scanf'
+make: Entering directory '$(@D)/rand'
+make: Leaving directory '$(@D)/rand'
+make: Entering directory '$(@D)/cxx'
+make: Leaving directory '$(@D)/cxx'
+make: Entering directory '$(@D)/demos'
+make: Entering directory '$(@D)/demos/calc'
+make: Entering directory '$(@D)/demos/calc'
+make: Leaving directory '$(@D)/demos/calc'
+make: Leaving directory '$(@D)/demos/calc'
+make: Entering directory '$(@D)/demos/expr'
+make: Leaving directory '$(@D)/demos/expr'
+make: Entering directory '$(@D)/demos'
+make: Leaving directory '$(@D)/demos'
+make: Leaving directory '$(@D)/demos'
+make: Entering directory '$(@D)/tune'
+make: Leaving directory '$(@D)/tune'
+make: Entering directory '$(@D)/doc'
+make: Leaving directory '$(@D)/doc'
+make: Entering directory '$(@D)'
+make: Leaving directory '$(@D)'
+make: Leaving directory '$(@D)'
--- a/components/mpc/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/mpc/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -77,9 +77,9 @@
 # Add install dependency when system-test target is implemented.
 include $(WS_MAKE_RULES)/common.mk
 
-CFLAGS +=		`pkg-config --cflags libmpfr`
-
 CONFIGURE_OPTIONS  +=	--infodir=$(CONFIGURE_INFODIR)
+CONFIGURE_OPTIONS  +=	--with-gmp-include=$(shell pkg-config --variable=includedir libgmp)
+CONFIGURE_OPTIONS  +=	--with-mpfr-include=$(shell pkg-config --variable=includedir libmpfr)
 CONFIGURE_OPTIONS  +=	--disable-static
 
 COMPONENT_TEST_DIR =	$(BUILD_DIR)/$(MACH$(BITS))/tests
--- a/components/mpfr/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/mpfr/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -82,8 +82,7 @@
 CONFIGURE_OPTIONS += --disable-libtool-lock
 CONFIGURE_OPTIONS += --enable-thread-safe
 CONFIGURE_OPTIONS += --enable-tests-timeout=0
-CONFIGURE_OPTIONS += --with-gmp-include=$(GMPINCDIR)
-CONFIGURE_OPTIONS += --with-gmp-lib=$(USRLIB.$(BITS))
+CONFIGURE_OPTIONS += --with-gmp-include=$(shell pkg-config --variable=includedir libgmp)
 CONFIGURE_OPTIONS += --with-mulhigh-size=$(MPFRMULHIGH)
 CONFIGURE_OPTIONS += --with-pic
 
--- a/components/ruby/ruby-21/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/ruby/ruby-21/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -197,6 +197,7 @@
 $(SKIP_TEST_AT_TOP_LEVEL)
 
 REQUIRED_PACKAGES += library/database/gdbm
+REQUIRED_PACKAGES += library/gmp
 REQUIRED_PACKAGES += library/libffi
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/readline
--- a/components/ruby/ruby-23/Makefile	Wed Mar 29 02:34:39 2017 -0700
+++ b/components/ruby/ruby-23/Makefile	Thu Mar 30 08:44:01 2017 -0700
@@ -200,6 +200,7 @@
 $(SKIP_TEST_AT_TOP_LEVEL)
 
 REQUIRED_PACKAGES += library/database/gdbm
+REQUIRED_PACKAGES += library/gmp
 REQUIRED_PACKAGES += library/libffi
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/readline