[arch-commits] Commit in singular/trunk (PKGBUILD singular-fix-rpath.patch)

[Antonio Rojas]

    Date: Monday, December 21, 2020 @ 20:45:24
  Author: arojas
Revision: 781535

New tarball

Modified:
  singular/trunk/PKGBUILD
Deleted:
  singular/trunk/singular-fix-rpath.patch

--------------------------+
 PKGBUILD                 |   14 +++++---------
 singular-fix-rpath.patch |   17 -----------------
 2 files changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-21 20:45:14 UTC (rev 781534)
+++ PKGBUILD	2020-12-21 20:45:24 UTC (rev 781535)
@@ -6,7 +6,7 @@
 _patchver=0
 pkgver=${_majver//-/.}.p${_patchver}
 #pkgver=${_majver//-/.}
-pkgrel=3
+pkgrel=4
 pkgdesc="Computer Algebra System for polynomial computations"
 arch=(x86_64)
 url="https://www.singular.uni-kl.de/"
@@ -14,20 +14,16 @@
 depends=(flint cddlib)
 makedepends=(doxygen polymake)
 optdepends=('polymake: Polymake module')
-source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz"
-         singular-polymake4.patch
-         singular-fix-rpath.patch)
+source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz"
+         singular-polymake4.patch)
 #source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
-sha256sums=('30771f138853f0ee1363b7ab7a1294dfbe0df754178be7e8adeeaac5d2707ffb'
-            'fdc5a6945b90812b631b5ac4be5013313abdd8b032e66781df2713bc897f4f37'
-            '977f71be3395189c7a8727f9aab5cafaf58a5bc5df117a2f29111b609547fc53')
+sha256sums=('5b0f6c036b4a6f58bf620204b004ec6ca3a5007acc8352fec55eade2fc9d63f6'
+            'fdc5a6945b90812b631b5ac4be5013313abdd8b032e66781df2713bc897f4f37')
 options=(!zipman)
 
 prepare() {
   cd singular-${_majver//-/.}
   patch -p1 -i ../singular-polymake4.patch # Fix build with polymake 4 (Fedora)
-  patch -p1 -i ../singular-fix-rpath.patch # Fix RPATH in libpoly
-  ./autogen.sh
 }
   
 build() {

Deleted: singular-fix-rpath.patch
===================================================================
--- singular-fix-rpath.patch	2020-12-21 20:45:14 UTC (rev 781534)
+++ singular-fix-rpath.patch	2020-12-21 20:45:24 UTC (rev 781535)
@@ -1,17 +0,0 @@
-diff --git a/factory/configure.ac b/factory/configure.ac
-index cd35dd297..0c40dd9af 100644
---- a/factory/configure.ac
-+++ b/factory/configure.ac
-@@ -225,8 +225,10 @@ BACKUP_LIBS=${LIBS}
- for GMP_HOME in ${GMP_HOME_PATH}
- do
-   if test "x$GMP_HOME" != "x/usr"; then
--    GMP_CPPFLAGS="-I${GMP_HOME}/include"
--    GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
-+    if test -e ${GMP_HOME}/include/gmp.h; then
-+      GMP_CPPFLAGS="-I${GMP_HOME}/include"
-+      GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
-+    fi
-   else
-     GMP_CPPFLAGS=""
-     GMP_LIBS="-lgmp"