summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2017-12-11 09:15:04 +0100
committerMichael Weber <xmw@gentoo.org>2017-12-11 09:15:04 +0100
commit8210cca97406e547eac3027180a7ef09c8cc6fe2 (patch)
tree96eaf5cddc3e0581ac02786678fe441bb40711bf /sci-electronics/geda/files
parentapp-misc/qlcplus: Version bump. (diff)
downloadgentoo-8210cca97406e547eac3027180a7ef09c8cc6fe2.tar.gz
gentoo-8210cca97406e547eac3027180a7ef09c8cc6fe2.tar.bz2
gentoo-8210cca97406e547eac3027180a7ef09c8cc6fe2.zip
sci-electronics/geda: Fix m4 test for guile-2.2, thanks Juergen Rose.
Closes: https://bugs.gentoo.org/639884 Package-Manager: Portage-2.3.17, Repoman-2.3.6
Diffstat (limited to 'sci-electronics/geda/files')
-rw-r--r--sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
new file mode 100644
index 000000000000..631673367801
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
@@ -0,0 +1,16 @@
+--- geda-gaf-1.9.2/m4/geda-guile.m4
++++ geda-gaf-1.9.2/m4/geda-guile.m4
+@@ -35,8 +35,13 @@
+ GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`
+
+ _found_pkg_config_guile=yes
++ PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
++ [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no])
++
++ if test "${_found_pkg_config_guile}" = "no" ; then
+ PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
+ [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no])
++ fi
+
+ if test "${_found_pkg_config_guile}" = "no" ; then
+ PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER],