1 files changed, 47 insertions, 0 deletions
diff --git a/guile-multilib.patch b/guile-multilib.patch
new file mode 100644
index 0000000..4baf309
--- /dev/null
+++ b/guile-multilib.patch
@@ -0,0 +1,47 @@
+diff -up guile-2.0.9/libguile/Makefile.in.multilib guile-2.0.9/libguile/Makefile.in
+--- guile-2.0.9/libguile/Makefile.in.multilib	2013-04-10 01:31:59.000000000 +0200
++++ guile-2.0.9/libguile/Makefile.in	2013-07-16 16:59:59.490527131 +0200
+@@ -3283,6 +3283,11 @@ install-nodist_modincludeHEADERS: $(nodi
+ 	while read files; do \
+ 	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(modincludedir)'"; \
+ 	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(modincludedir)" || exit $$?; \
++	  for f in $$files; do if [ "$$f" = "scmconfig.h" ]; then \
++	    grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \
++	    mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \
++	    $(INSTALL_HEADER) "$${d}scmconfig-multilib.h" "$(DESTDIR)$(modincludedir)/$$f"; \
++	  fi; done \
+ 	done
+ 
+ uninstall-nodist_modincludeHEADERS:
+diff -up guile-2.0.9/libguile/scmconfig-multilib.h.multilib guile-2.0.9/libguile/scmconfig-multilib.h
+--- guile-2.0.9/libguile/scmconfig-multilib.h.multilib	2013-07-16 17:02:26.045733704 +0200
++++ guile-2.0.9/libguile/scmconfig-multilib.h	2013-07-16 17:01:51.623685971 +0200
+@@ -0,0 +1,7 @@
++/* multilib clean wrapper */
++#include <bits/wordsize.h>
++#if __WORDSIZE == 32
++#include "libguile/scmconfig-32.h"
++#else
++#include "libguile/scmconfig-64.h"
++#endif
+diff -up guile-2.0.9/meta/guile-config.in.multilib guile-2.0.9/meta/guile-config.in
+--- guile-2.0.9/meta/guile-config.in.multilib	2012-07-02 11:28:14.000000000 +0200
++++ guile-2.0.9/meta/guile-config.in	2013-07-16 17:09:25.650324597 +0200
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+-PKG_CONFIG_PATH="@pkgconfigdir@:$PKG_CONFIG_PATH"
+ GUILE_AUTO_COMPILE=0
+-export PKG_CONFIG_PATH GUILE_AUTO_COMPILE
++export GUILE_AUTO_COMPILE
+ 
+ exec "@installed_guile@" -e main -s $0 "$@"
+ !#
+@@ -31,7 +30,7 @@ exec "@installed_guile@" -e main -s $0 "
+              (ice-9 rdelim))
+ 
+ 
+-(define %pkg-config-program "@PKG_CONFIG@")
++(define %pkg-config-program "pkg-config")
+ 
+ ;;;; main function, command-line processing
+