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

[Antonio Rojas]

    Date: Friday, December 18, 2020 @ 19:00:13
  Author: arojas
Revision: 779464

Fix wrong RPATH properly

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-18 18:54:25 UTC (rev 779463)
+++ PKGBUILD	2020-12-18 19:00:13 UTC (rev 779464)
@@ -6,25 +6,29 @@
 _patchver=0
 pkgver=${_majver//-/.}.p${_patchver}
 #pkgver=${_majver//-/.}
-pkgrel=2
+pkgrel=3
 pkgdesc="Computer Algebra System for polynomial computations"
 arch=(x86_64)
 url="https://www.singular.uni-kl.de/"
 license=(GPL)
 depends=(flint cddlib)
-makedepends=(doxygen polymake chrpath)
-checkdepends=(python2)
+makedepends=(doxygen polymake)
+#checkdepends=(python2)
 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-polymake4.patch
+         singular-fix-rpath.patch)
 #source=("ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
 sha256sums=('30771f138853f0ee1363b7ab7a1294dfbe0df754178be7e8adeeaac5d2707ffb'
-            'fdc5a6945b90812b631b5ac4be5013313abdd8b032e66781df2713bc897f4f37')
+            'fdc5a6945b90812b631b5ac4be5013313abdd8b032e66781df2713bc897f4f37'
+            '977f71be3395189c7a8727f9aab5cafaf58a5bc5df117a2f29111b609547fc53')
 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() {
@@ -47,6 +51,4 @@
   install -Dm644 doc/singular.idx -t "$pkgdir"/usr/share/singular
   # Fix ownership
   chown -R root:root "$pkgdir"/usr/share/singular/html "$pkgdir"/usr/share/info "$pkgdir"/usr/share/singular/singular.idx
-  # Fix RPATH
-  chrpath -d "$pkgdir"/usr/lib/libfactory-4.2.0.so
 }

Added: singular-fix-rpath.patch
===================================================================
--- singular-fix-rpath.patch	                        (rev 0)
+++ singular-fix-rpath.patch	2020-12-18 19:00:13 UTC (rev 779464)
@@ -0,0 +1,17 @@
+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"