[arch-commits] Commit in ntl/trunk (PKGBUILD ntl-sage.patch)

[Antonio Rojas]

    Date: Friday, July 10, 2015 @ 21:09:58
  Author: arojas
Revision: 136663

Update to 9.3.0, enable NTL_LEGACY_SP_MULMOD, remove merged Sage patch

Modified:
  ntl/trunk/PKGBUILD
Deleted:
  ntl/trunk/ntl-sage.patch

----------------+
 PKGBUILD       |   18 +++++-------------
 ntl-sage.patch |   52 ----------------------------------------------------
 2 files changed, 5 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-10 19:00:37 UTC (rev 136662)
+++ PKGBUILD	2015-07-10 19:09:58 UTC (rev 136663)
@@ -3,8 +3,8 @@
 # Contributor: Brad Conte <brad AT bradconte.com>
 
 pkgname=ntl
-pkgver=9.2.0
-pkgrel=2
+pkgver=9.3.0
+pkgrel=1
 pkgdesc="A Library for doing Number Theory"
 arch=(i686 x86_64)
 url="http://www.shoup.net/ntl/"
@@ -11,19 +11,12 @@
 license=(GPL)
 depends=(gf2x gmp)
 makedepends=()
-options=(!libtool)
-source=("http://www.shoup.net/$pkgname/$pkgname-$pkgver.tar.gz" 'ntl-sage.patch')
-md5sums=('bf419b48ea567858e47e0aac3c849fbe'
-         '4cb5f97080281109bf358959ab993691')
+source=("http://www.shoup.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('e55dd4fcb3a6b4901776239ccffb2300')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p0 -i $srcdir/ntl-sage.patch
-}
-
 build() {
   cd $pkgname-$pkgver/src
-  ./configure DEF_PREFIX=/usr SHARED=on NTL_GF2X_LIB=on NTL_GMP_LIP=on NTL_DISABLE_LONGLONG=on
+  ./configure DEF_PREFIX=/usr SHARED=on NTL_GF2X_LIB=on NTL_GMP_LIP=on NTL_LEGACY_SP_MULMOD=on
   make
 }
 
@@ -36,4 +29,3 @@
   cd $pkgname-$pkgver/src
   make PREFIX="$pkgdir/usr" install
 }
-

Deleted: ntl-sage.patch
===================================================================
--- ntl-sage.patch	2015-07-10 19:00:37 UTC (rev 136662)
+++ ntl-sage.patch	2015-07-10 19:09:58 UTC (rev 136663)
@@ -1,52 +0,0 @@
---- ./include/NTL/tools.h.orig	2015-01-09 06:58:19.000000000 -0700
-+++ ./include/NTL/tools.h	2015-01-12 20:00:00.000000000 -0700
-@@ -406,7 +406,12 @@ void swap(WrappedPtr<T,Deleter>& x, Wrap
- 
- // Error Handling
- 
--
-+/*
-+  This function is not present in vanilla NTL.
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context),
-+			      void *context);
- 
- class ErrorObject : public NTL_SNS runtime_error {
- public:
---- ./src/tools.c.orig	2015-01-09 06:58:19.000000000 -0700
-+++ ./src/tools.c	2015-01-12 20:00:00.000000000 -0700
-@@ -17,9 +17,33 @@ NTL_START_IMPL
- 
- NTL_THREAD_LOCAL void (*ErrorCallback)() = 0;
- 
-+/*
-+   The following code differs from vanilla NTL.
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function
-+    _function_,  which gets called with parameter _context_ and an error
-+    message string whenever Error() gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the
-+   error message back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
- 
- void TerminalError(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    _ntl_abort();
- }