- Update to 1.0

PR:		207266
Submitted by:	takefu@airport.fm

2 files changed, 47 insertions, 57 deletions

diff --git a/math/libtommath/files/patch-makefile b/math/libtommath/files/patch-makefile
deleted file mode 100644
index 8e262a3dadab..000000000000
--- a/math/libtommath/files/patch-makefile
+++ /dev/null
@@ -1,57 +0,0 @@
---- makefile.bak	2010-07-30 12:05:21.219322050 +0200
-+++ makefile	2010-07-30 12:07:19.588144344 +0200
-@@ -14,7 +14,7 @@
- ifndef IGNORE_SPEED
- 
- #for speed 
--CFLAGS += -O3 -funroll-loops
-+CFLAGS += -funroll-loops
- 
- #for size 
- #CFLAGS += -Os
-@@ -53,9 +53,9 @@
- #INCPATH-The directory to install the header files for libtommath.
- #DATAPATH-The directory to install the pdf docs.
- DESTDIR=
--LIBPATH=/usr/lib
--INCPATH=/usr/include
--DATAPATH=/usr/share/doc/libtommath/pdf
-+LIBPATH=${PREFIX}/lib
-+INCPATH=${PREFIX}/include
-+DATAPATH=${DOCSDIR}/pdf
- 
- OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
- bn_mp_clamp.o bn_mp_zero.o  bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
---- makefile.shared.orig	2010-07-23 16:27:20.000000000 +0200
-+++ makefile.shared	2013-04-18 15:26:25.000000000 +0200
-@@ -10,7 +10,7 @@
- ifndef IGNORE_SPEED
- 
- #for speed 
--CFLAGS += -O3 -funroll-loops
-+CFLAGS += -funroll-loops
- 
- #for size 
- #CFLAGS += -Os
-@@ -48,9 +48,9 @@
- #INCPATH-The directory to install the header files for libtommath.
- #DATAPATH-The directory to install the pdf docs.
- DESTDIR=
--LIBPATH=/usr/lib
--INCPATH=/usr/include
--DATAPATH=/usr/share/doc/libtommath/pdf
-+LIBPATH=${PREFIX}/lib
-+INCPATH=${PREFIX}/include
-+DATAPATH=${DOCSDIR}/pdf
- 
- OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
- bn_mp_clamp.o bn_mp_zero.o  bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
-@@ -93,7 +93,7 @@
- 
- test: $(LIBNAME) demo/demo.o
- 	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
--	libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
-+	libtool --mode=link gcc -o test demo/demo.o .libs/$(LIBNAME_S)
- 	
- mtest: test	
- 	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
diff --git a/math/libtommath/files/patch-makefile.include b/math/libtommath/files/patch-makefile.include
new file mode 100644
index 000000000000..9aa4bb7d7bf5
--- /dev/null
+++ b/math/libtommath/files/patch-makefile.include
@@ -0,0 +1,47 @@
+--- makefile.include.orig	2016-02-03 18:07:27 UTC
++++ makefile.include
+@@ -14,15 +14,15 @@ ifndef PREFIX
+   PREFIX=
+ endif
+ 
+-ifeq ($(CC),cc)
+-  CC = $(PREFIX)gcc
+-endif
+-LD=$(PREFIX)ld
+-AR=$(PREFIX)ar
+-RANLIB=$(PREFIX)ranlib
++#ifeq ($(CC),cc)
++#  CC = $(PREFIX)gcc
++#endif
++#LD=$(PREFIX)ld
++AR=$(shell which ar)
++RANLIB=$(shell which ranlib)
+ 
+ ifndef MAKE
+-   MAKE=make
++   MAKE=$(shell which gmake)
+ endif
+ 
+ CFLAGS += -I./ -Wall -Wsign-compare -Wextra -Wshadow
+@@ -55,7 +55,7 @@ endif # COMPILE_SIZE
+ endif # COMPILE_DEBUG
+ 
+ # adjust coverage set
+-ifneq ($(filter $(shell arch), i386 i686 x86_64 amd64 ia64),)
++ifneq ($(filter $(shell /sbin/sysctl -b hw.machine_arch), i386 i686 x86_64 amd64 ia64),)
+    COVERAGE = test_standalone timing
+    COVERAGE_APP = ./test && ./ltmtest
+ else
+@@ -71,9 +71,9 @@ test_standalone: CFLAGS+=-DLTM_DEMO_TEST
+ #LIBPATH-The directory for libtommath to be installed to.
+ #INCPATH-The directory to install the header files for libtommath.
+ #DATAPATH-The directory to install the pdf docs.
+-LIBPATH?=/usr/lib
+-INCPATH?=/usr/include
+-DATAPATH?=/usr/share/doc/libtommath/pdf
++LIBPATH?=$(PREFIX)/lib
++INCPATH?=$(PREFIX)/include
++DATAPATH?=$(DOCSDIR)/pdf
+ 
+ #make the code coverage of the library
+ #