Re: [PR PATCH] [Updated] guile1.8: use better cross-patch

[ndowens <ndowens@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages guile1.8
https://github.com/void-linux/void-packages/pull/27564

guile1.8: use better cross-patch
Also move *.so to -devel

A patch file from https://github.com/void-linux/void-packages/pull/27564.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile1.8-27564.patch --]
[-- Type: text/x-diff, Size: 5318 bytes --]

From 4c2244b289a0e1c1924b85d14836c8ff50de52fc Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 30 Dec 2020 17:11:58 -0600
Subject: [PATCH] guile1.8: use better cross-patch

Also move *.so to -devel
---
 .../patches/0001-fix-cross-build.patch        | 52 +++++++++++++++++++
 srcpkgs/guile1.8/patches/cross.patch          | 25 ---------
 srcpkgs/guile1.8/template                     | 11 ++--
 3 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 srcpkgs/guile1.8/patches/0001-fix-cross-build.patch
 delete mode 100644 srcpkgs/guile1.8/patches/cross.patch

diff --git a/srcpkgs/guile1.8/patches/0001-fix-cross-build.patch b/srcpkgs/guile1.8/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..55de22c38f3
--- /dev/null
+++ b/srcpkgs/guile1.8/patches/0001-fix-cross-build.patch
@@ -0,0 +1,52 @@
+From c7f77ad985b277f044484ecdb57b2bdd6eb7e772 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Wed, 30 Dec 2020 17:05:34 -0600
+Subject: [PATCH] fix cross build
+
+---
+ configure.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git configure.in configure.in
+index 217ac83..ae43832 100644
+--- configure.in
++++ configure.in
+@@ -838,7 +838,7 @@ fi
+ if test "$ac_cv_type_complex_double" = yes; then
+   AC_CACHE_CHECK([whether csqrt is usable],
+     guile_cv_use_csqrt,
+-    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
++    [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <complex.h>
+ /* "volatile" is meant to prevent gcc from calculating the sqrt as a
+    constant, we want to test libc. */
+@@ -1035,7 +1035,7 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_len],,,
+ AC_MSG_CHECKING(whether localtime caches TZ)
+ AC_CACHE_VAL(guile_cv_localtime_cache,
+ [if test x$ac_cv_func_tzset = xyes; then
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <time.h>
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ #endif
+@@ -1196,7 +1196,7 @@ GUILE_STRUCT_UTIMBUF
+ #--------------------------------------------------------------------
+ 
+ SCM_I_GSC_STACK_GROWS_UP=0
+-AC_RUN_IFELSE([AC_LANG_SOURCE(
++AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+ [AC_INCLUDES_DEFAULT
+ int
+ find_stack_direction ()
+@@ -1374,7 +1374,7 @@ if test "$with_threads" = pthreads; then
+ AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread)
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #if HAVE_PTHREAD_ATTR_GETSTACK
+ #include <pthread.h>
+ 
+-- 
+2.30.0
+
diff --git a/srcpkgs/guile1.8/patches/cross.patch b/srcpkgs/guile1.8/patches/cross.patch
deleted file mode 100644
index 0b51020c911..00000000000
--- a/srcpkgs/guile1.8/patches/cross.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Configure cannot execute built binary when cross compiling.
-The patch skips the test and assumes "no".
-This is how it is done in version 2.0.14's configure script.
-
---- configure.orig	2017-09-15 11:14:54.427295947 +0200
-+++ configure	2017-09-15 14:11:07.253528181 +0200
-@@ -19802,6 +19802,7 @@
- $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; }
- old_CFLAGS="$CFLAGS"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-+if test "$cross_compiling" = no; then
- if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-@@ -19849,6 +19850,10 @@
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
-+else
-+  works="assuming it doesn't"
-+fi
-+
- CFLAGS="$old_CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5
- $as_echo "$works" >&6; }
diff --git a/srcpkgs/guile1.8/template b/srcpkgs/guile1.8/template
index 2f575000cbf..4a43672f4d4 100644
--- a/srcpkgs/guile1.8/template
+++ b/srcpkgs/guile1.8/template
@@ -1,12 +1,12 @@
 # Template file for 'guile1.8'
 pkgname=guile1.8
 version=1.8.8
-revision=3
+revision=4
 wrksrc=${pkgname/1.8/}-${version}
 build_style="gnu-configure"
 configure_args="--disable-static --disable-error-on-warning --program-suffix='-1.8'"
 make_build_args="GUILE_FOR_BUILD=guile"
-hostmakedepends="pkg-config guile"
+hostmakedepends="automake gettext libtool pkg-config guile"
 makedepends="gmp-devel libltdl-devel ncurses-devel readline-devel"
 short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
@@ -15,6 +15,10 @@ homepage="https://www.gnu.org/software/guile/guile.html"
 distfiles="${GNU_SITE}/${pkgname/1.8/}/${pkgname/1.8/}-${version}.tar.gz"
 checksum=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	# conflicts with guile-2.0
 	rm -rf ${DESTDIR}/usr/share/info
@@ -25,8 +29,9 @@ guile1.8-devel_package() {
 	depends="gmp-devel ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/guile-config-1.8
-		sed -i '1s|/usr/bin/guile|/usr/bin/guile-1.8|' ${PKGDESTDIR}/usr/bin/guile-config-1.8
+		vsed -i '1s|/usr/bin/guile|/usr/bin/guile-1.8|' ${PKGDESTDIR}/usr/bin/guile-config-1.8
 		vmove usr/include
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove usr/share/aclocal
 		mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-1.8.m4}