From 1b1df1acf9ca499cf23e197efb07f6e9689a9fec Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Nov 2017 14:28:17 +0100
Subject: [PATCH] libtommath: bump version.

* now produces shared library.
---
 ...-0.42.0.recipe => libtommath-1.0.1.recipe} | 34 ++++++++-----
 .../patches/libtommath-0.42.0.patchset        | 50 -------------------
 2 files changed, 22 insertions(+), 62 deletions(-)
 rename dev-libs/libtommath/{libtommath-0.42.0.recipe => libtommath-1.0.1.recipe} (52%)
 delete mode 100644 dev-libs/libtommath/patches/libtommath-0.42.0.patchset

diff --git a/dev-libs/libtommath/libtommath-0.42.0.recipe b/dev-libs/libtommath/libtommath-1.0.1.recipe
similarity index 52%
rename from dev-libs/libtommath/libtommath-0.42.0.recipe
rename to dev-libs/libtommath/libtommath-1.0.1.recipe
index 4d38ef6a7..a9954b532 100644
--- a/dev-libs/libtommath/libtommath-0.42.0.recipe
+++ b/dev-libs/libtommath/libtommath-1.0.1.recipe
@@ -5,15 +5,16 @@ HOMEPAGE="http://libtommath.org"
 COPYRIGHT="2010 Tom St. Denis"
 LICENSE="Public Domain"
 REVISION="1"
-SOURCE_URI="https://github.com/libtom/libtommath/archive/v0.42.0.tar.gz"
-CHECKSUM_SHA256="5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8"
-PATCHES="libtommath-0.42.0.patchset"
+SOURCE_URI="https://github.com/libtom/libtommath/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="db2b6e6b512aac5cc9be7e4ffdd15d971c3f03d3fa35f91607bfe1a7fa75a7a7"
+#PATCHES="libtommath-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	libtommath$secondaryArchSuffix = $portVersion
+	lib:libtommath$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -21,7 +22,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libtommath${secondaryArchSuffix}_devel = $portVersion
-	devel:libtommath$secondaryArchSuffix = $portVersion
+	devel:libtommath$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
@@ -30,23 +31,32 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:ar$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool$secondaryArchSuffix
 	cmd:make
-	cmd:cc
-	cmd:ar
-	cmd:ranlib
-	cmd:install
+	cmd:ranlib$secondaryArchSuffix
+	cmd:sed
 	"
 
 BUILD()
 {
-	make $jobArgs
+	make $jobArgs -f makefile.shared IGNORE_SPEED=1 
 }
 
 INSTALL()
 {
 	export LIBPATH=$libDir
 	export INCPATH=$includeDir
-	make install $jobArgs
+	make -f makefile.shared install
+
+	rm $libDir/libtommath.la
+
 	prepareInstalledDevelLibs libtommath
+	fixPkgconfig
+
 	packageEntries devel $developDir
 }
diff --git a/dev-libs/libtommath/patches/libtommath-0.42.0.patchset b/dev-libs/libtommath/patches/libtommath-0.42.0.patchset
deleted file mode 100644
index bc86a4b3b..000000000
--- a/dev-libs/libtommath/patches/libtommath-0.42.0.patchset
+++ /dev/null
@@ -1,50 +0,0 @@
-From f2b4b4b4aa83b658ae9a23d5195e04487a102d88 Mon Sep 17 00:00:00 2001
-From: Nolan Clark <tweakdeveloper@gmail.com>
-Date: Sat, 6 Dec 2014 16:01:50 -0600
-Subject: applying patch makefile.patch
-
-
-diff --git a/makefile b/makefile
-index 70de306..e3a0a04 100644
---- a/makefile
-+++ b/makefile
-@@ -27,18 +27,9 @@ CFLAGS  += -fomit-frame-pointer
- 
- endif
- 
--#install as this user
--ifndef INSTALL_GROUP
--   GROUP=wheel
--else
--   GROUP=$(INSTALL_GROUP)
--endif
--
--ifndef INSTALL_USER
--   USER=root
--else
--   USER=$(INSTALL_USER)
--endif
-+#install as this user and group
-+USER=user
-+GROUP=root
- 
- #default files to install
- ifndef LIBNAME
-@@ -49,14 +40,6 @@ default: ${LIBNAME}
- 
- HEADERS=tommath.h tommath_class.h tommath_superclass.h
- 
--#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.
--DESTDIR=
--LIBPATH=/usr/lib
--INCPATH=/usr/include
--DATAPATH=/usr/share/doc/libtommath/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 \
- bn_mp_init_copy.o bn_mp_abs.o bn_mp_neg.o bn_mp_cmp_mag.o bn_mp_cmp.o bn_mp_cmp_d.o \
--- 
-1.8.3.4
-