commit d53b2ad5c1b0917b70d2737bb6d0474fe2f3ca37
Author: Jan Rękorajski <[email protected]>
Date: Sun Mar 31 13:16:26 2019 +0200
- build with guile 2.2
- rel 2
linux-gpib-guile2.patch | 5 +++--
linux-gpib.spec | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index 65cde52..305013d 100644
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -33,7 +33,7 @@ exit 1
%include /usr/lib/rpm/macros.perl
%define php_name php%{?php_suffix}
-%define rel 1
+%define rel 2
%define pname linux-gpib
Summary: GPIB (IEEE 488) Linux support
Summary(pl.UTF-8): Obsługa GPIB (IEEE 488) dla Linuksa
@@ -293,7 +293,7 @@ cd linux-gpib-user-%{version}
%{__autoheader}
%{__automake}
%if %{with guile}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.0"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.2"
%endif
%configure \
%{?with_drivers_isa:--enable-isa} \
diff --git a/linux-gpib-guile2.patch b/linux-gpib-guile2.patch
index 427a252..8d08324 100644
--- a/linux-gpib-guile2.patch
+++ b/linux-gpib-guile2.patch
@@ -1,13 +1,14 @@
--- linux-gpib-4.0.3/configure.ac.orig 2016-04-09 15:34:55.000000000 +0200
+++ linux-gpib-4.0.3/configure.ac 2016-07-06 17:55:18.567320365 +0200
-@@ -143,8 +143,10 @@
+@@ -143,8 +143,11 @@
fi
dnl Checks for libraries.
++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])],[])
-+])
++])])
AC_CHECK_LIB([readline], [readline],
[readline_lib=yes;AC_SUBST([LIB_READLINE_LDFLAGS], ["-lreadline
-lncurses"])],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/d53b2ad5c1b0917b70d2737bb6d0474fe2f3ca37
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
