commit 346fe22bbdc4ca1d904b35966e5785a461e08579
Author: Jan Rękorajski <[email protected]>
Date: Sat Mar 26 11:02:28 2022 +0100
- fix building with guile 3.0, rebuild with python 3.10, rel 8
linux-gpib-guile3.patch | 16 ++++++++++++++++
linux-gpib.spec | 6 ++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index 0c08320..9640928 100644
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -39,7 +39,7 @@ exit 1
%define php_name php%{?php_suffix}
-%define rel 7
+%define rel 8
%define pname linux-gpib
Summary: GPIB (IEEE 488) Linux support
Summary(pl.UTF-8): Obsługa GPIB (IEEE 488) dla Linuksa
@@ -58,6 +58,7 @@ Patch6: %{pname}-php7.patch
Patch8: kernel-5.2.patch
Patch9: kernel-5.10.patch
Patch10: pkgconfig-version.patch
+Patch11: linux-gpib-guile3.patch
URL: http://linux-gpib.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -288,6 +289,7 @@ cd linux-gpib-user-%{version}
%patch5 -p1
#%patch6 -p1
%patch10 -p1
+%patch11 -p1
cd ..
%endif
@@ -309,7 +311,7 @@ cd linux-gpib-user-%{version}
%{__autoheader}
%{__automake}
%if %{with guile}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.2"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/3.0"
%endif
%configure \
--with-udev-libdir=/lib/udev \
diff --git a/linux-gpib-guile3.patch b/linux-gpib-guile3.patch
new file mode 100644
index 0000000..65728f5
--- /dev/null
+++ b/linux-gpib-guile3.patch
@@ -0,0 +1,16 @@
+--- linux-gpib-user-4.3.4/configure.ac~ 2022-03-26 10:55:11.000000000
+0100
++++ linux-gpib-user-4.3.4/configure.ac 2022-03-26 10:57:43.364009520 +0100
+@@ -106,11 +106,12 @@
+
+ dnl Checks for libraries.
+ if test "$BIND_GUILE" = "yes"; then
++AC_CHECK_LIB([guile-3.0],[scm_c_define],[:],[
+ AC_CHECK_LIB([guile-2.2],[scm_c_define],[:],[
+ AC_CHECK_LIB([guile-2.0],[scm_c_define],[:],[
+ AC_CHECK_LIB([guile],[gh_define],[echo this prevents default actions from
occurring > /dev/null],
+ [BIND_GUILE="no";AC_MSG_NOTICE([libguile not found, disabling guile
binding])],[])
+-])])
++])])])
+ fi
+
+ AC_CHECK_LIB([readline], [readline],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/346fe22bbdc4ca1d904b35966e5785a461e08579
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
