[packages/gnuastro] - disable lib-prefix bullshit that's just utter confused failure that breaks x32 build

baggins baggins at pld-linux.org
Sat Dec 14 11:56:16 CET 2019


commit ae3226abdea7b29067d35a342ea86e4e03d78ecc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 14 11:53:01 2019 +0100

    - disable lib-prefix bullshit that's just utter confused failure that breaks x32 build

 ac.patch      | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gnuastro.spec |  2 ++
 2 files changed, 94 insertions(+)
---
diff --git a/gnuastro.spec b/gnuastro.spec
index e17a072..036296c 100644
--- a/gnuastro.spec
+++ b/gnuastro.spec
@@ -12,6 +12,7 @@ Group:		Applications/Science
 Source0:	https://ftp.gnu.org/gnu/gnuastro/%{name}-%{version}.tar.lz
 # Source0-md5:	5fcb6f89710d9047dabeaec6fe054b43
 Patch0:		%{name}-info.patch
+Patch1:		ac.patch
 URL:		http://www.gnu.org/software/gnuastro/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -81,6 +82,7 @@ Statyczna biblioteka Gnuastro.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # regenerate for as-needed to work
diff --git a/ac.patch b/ac.patch
new file mode 100644
index 0000000..9bc6d1c
--- /dev/null
+++ b/ac.patch
@@ -0,0 +1,92 @@
+--- gnuastro-0.11/bootstrapped/m4/lib-link.m4~	2019-11-25 15:44:53.000000000 +0100
++++ gnuastro-0.11/bootstrapped/m4/lib-link.m4	2019-12-14 11:51:26.413058282 +0100
+@@ -285,7 +285,7 @@
+                   dnl The same code as in the loop below:
+                   dnl First look for a shared library.
+                   if test -n "$acl_shlibext"; then
+-                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
++                    if test -f "$dir/$libname$shrext" ; then
+                       found_dir="$dir"
+                       found_so="$dir/$libname$shrext"
+                     else
+@@ -295,14 +295,14 @@
+                               | sed -e "s,^$libname$shrext\\\\.,," \
+                               | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                               | sed 1q ) 2>/dev/null`
+-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
++                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" ; then
+                           found_dir="$dir"
+                           found_so="$dir/$libname$shrext.$ver"
+                         fi
+                       else
+                         eval library_names=\"$acl_library_names_spec\"
+                         for f in $library_names; do
+-                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
++                          if test -f "$dir/$f" ; then
+                             found_dir="$dir"
+                             found_so="$dir/$f"
+                             break
+@@ -313,7 +313,7 @@
+                   fi
+                   dnl Then look for a static library.
+                   if test "X$found_dir" = "X"; then
+-                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
++                    if test -f "$dir/$libname.$acl_libext" ; then
+                       found_dir="$dir"
+                       found_a="$dir/$libname.$acl_libext"
+                     fi
+@@ -335,7 +335,7 @@
+                   dir=`echo "X$x" | sed -e 's/^X-L//'`
+                   dnl First look for a shared library.
+                   if test -n "$acl_shlibext"; then
+-                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
++                    if test -f "$dir/$libname$shrext" ; then
+                       found_dir="$dir"
+                       found_so="$dir/$libname$shrext"
+                     else
+@@ -345,14 +345,14 @@
+                               | sed -e "s,^$libname$shrext\\\\.,," \
+                               | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                               | sed 1q ) 2>/dev/null`
+-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
++                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" ; then
+                           found_dir="$dir"
+                           found_so="$dir/$libname$shrext.$ver"
+                         fi
+                       else
+                         eval library_names=\"$acl_library_names_spec\"
+                         for f in $library_names; do
+-                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
++                          if test -f "$dir/$f" ; then
+                             found_dir="$dir"
+                             found_so="$dir/$f"
+                             break
+@@ -363,7 +363,7 @@
+                   fi
+                   dnl Then look for a static library.
+                   if test "X$found_dir" = "X"; then
+-                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
++                    if test -f "$dir/$libname.$acl_libext" ; then
+                       found_dir="$dir"
+                       found_a="$dir/$libname.$acl_libext"
+                     fi
+--- gnuastro-0.11/bootstrapped/m4/gnulib-comp.m4~	2019-11-25 15:45:05.000000000 +0100
++++ gnuastro-0.11/bootstrapped/m4/gnulib-comp.m4	2019-12-14 11:52:01.243057098 +0100
+@@ -1630,7 +1630,6 @@
+   m4/ldexp.m4
+   m4/lib-ld.m4
+   m4/lib-link.m4
+-  m4/lib-prefix.m4
+   m4/libunistring-base.m4
+   m4/limits-h.m4
+   m4/localcharset.m4
+--- gnuastro-0.11/aclocal.m4~	2019-12-14 11:40:25.000000000 +0100
++++ gnuastro-0.11/aclocal.m4	2019-12-14 11:52:13.989723321 +0100
+@@ -1723,7 +1723,6 @@
+ m4_include([bootstrapped/m4/ldexp.m4])
+ m4_include([bootstrapped/m4/lib-ld.m4])
+ m4_include([bootstrapped/m4/lib-link.m4])
+-m4_include([bootstrapped/m4/lib-prefix.m4])
+ m4_include([bootstrapped/m4/libtool.m4])
+ m4_include([bootstrapped/m4/libunistring-base.m4])
+ m4_include([bootstrapped/m4/limits-h.m4])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnuastro.git/commitdiff/ae3226abdea7b29067d35a342ea86e4e03d78ecc



More information about the pld-cvs-commit mailing list