summarylogtreecommitdiffstats
path: root/fix-version-detect.patch
diff options
context:
space:
mode:
authorAndrew Whatson2019-11-08 14:42:17 +1000
committerAndrew Whatson2019-11-08 14:50:46 +1000
commita8debe3f26a1bf20670fd93a5ffb080d89d6e75c (patch)
tree6d5724fe7887c978f35af647d7b7a0f2bd23a98c /fix-version-detect.patch
downloadaur-a8debe3f26a1bf20670fd93a5ffb080d89d6e75c.tar.gz
Initial commit
Diffstat (limited to 'fix-version-detect.patch')
-rw-r--r--fix-version-detect.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/fix-version-detect.patch b/fix-version-detect.patch
new file mode 100644
index 00000000000..6f486ee39cf
--- /dev/null
+++ b/fix-version-detect.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.in b/Makefile.in
+index ecf9729..95dde59 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -285,8 +285,13 @@ CLEANFILES = $(GOBJECTS)
+ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) pre-inst-env.in package.scm
+ GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+ SUFFIXES = .scm .go
+-moddir = $(prefix)/share/guile/site/2.0
+-godir = $(libdir)/guile/2.0/ccache
++
++guile_site_dir := $(shell $(GUILE) -c '(display (%site-dir))')
++guile_site_ccache_dir := $(shell $(GUILE) -c '(display (%site-ccache-dir))')
++
++moddir=$(guile_site_dir)
++godir=$(guile_site_ccache_dir)
++
+ bin_SCRIPTS = \
+ scripts/shroud
+
+diff --git a/configure b/configure
+index ec8d94d..639b783 100755
+--- a/configure
++++ b/configure
+@@ -2435,8 +2435,10 @@ $as_echo_n "checking for Guile version >= $_guile_required_version... " >&6; }
+ if test "$_guile_major_version" -ge "$_major_version"; then
+ if test "$_guile_minor_version" -ge "$_minor_version"; then
+ if test -n "$_micro_version"; then
+- if test "$_guile_micro_version" -lt "$_micro_version"; then
+- as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5
++ if test "$_guile_minor_version" -eq "$_minor_version"; then
++ if test "$_guile_micro_version" -lt "$_micro_version"; then
++ as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5
++ fi
+ fi
+ fi
+ elif test "$GUILE_EFFECTIVE_VERSION" == "$_major_version.$_minor_version" -a -z "$_micro_version"; then