|
 |
90e274 |
diff -up guile-1.8.7/libguile/Makefile.in.multilib guile-1.8.7/libguile/Makefile.in
|
|
|
90e274 |
--- guile-1.8.7/libguile/Makefile.in.multilib 2009-07-05 22:25:09.000000000 +0200
|
|
|
90e274 |
+++ guile-1.8.7/libguile/Makefile.in 2009-07-16 18:07:44.000000000 +0200
|
|
|
90e274 |
@@ -1717,6 +1717,11 @@ install-nodist_modincludeHEADERS: $(nodi
|
|
|
90e274 |
while read files; do \
|
|
|
90e274 |
echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(modincludedir)'"; \
|
|
|
90e274 |
$(INSTALL_HEADER) $$files "$(DESTDIR)$(modincludedir)" || exit $$?; \
|
|
|
90e274 |
+ for f in $$files; do if [ "$$f" = "scmconfig.h" ]; then \
|
|
|
90e274 |
+ grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \
|
|
|
90e274 |
+ mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \
|
|
|
90e274 |
+ $(INSTALL_HEADER) "$${d}scmconfig.h.mlib" "$(DESTDIR)$(modincludedir)/$$f"; \
|
|
|
90e274 |
+ fi; done \
|
|
|
90e274 |
done
|
|
|
90e274 |
|
|
|
90e274 |
uninstall-nodist_modincludeHEADERS:
|
|
|
90e274 |
diff -up guile-1.8.7/libguile/guile-snarf.in.multilib guile-1.8.7/libguile/guile-snarf.in
|
|
|
90e274 |
--- guile-1.8.7/libguile/guile-snarf.in.multilib 2009-07-04 00:19:00.000000000 +0200
|
|
|
90e274 |
+++ guile-1.8.7/libguile/guile-snarf.in 2009-07-16 18:06:48.000000000 +0200
|
|
|
90e274 |
@@ -39,7 +39,6 @@
|
|
|
90e274 |
# #endif
|
|
|
90e274 |
#
|
|
|
90e274 |
# If the environment variable CPP is set, use its value instead of the
|
|
|
90e274 |
-# C pre-processor determined at Guile configure-time: "@CPP@".
|
|
|
90e274 |
|
|
|
90e274 |
# Code:
|
|
|
90e274 |
|
|
|
90e274 |
@@ -75,7 +74,7 @@ tempdir="$TMPDIR/guile-snarf.$$"
|
|
|
90e274 |
(umask 077 && mkdir $tempdir) || exit 1
|
|
|
90e274 |
temp="$tempdir/tmp"
|
|
|
90e274 |
|
|
|
90e274 |
-if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
|
|
|
90e274 |
+if [ x"$CPP" = x ] ; then cpp="gcc -E" ; else cpp="$CPP" ; fi
|
|
|
90e274 |
|
|
|
90e274 |
trap "rm -rf $tempdir" 0 1 2 15
|
|
|
90e274 |
|
|
|
90e274 |
diff -up /dev/null guile-1.8.7/libguile/scmconfig.h.mlib
|
|
|
90e274 |
--- /dev/null 2009-06-24 16:43:53.264001725 +0200
|
|
|
90e274 |
+++ guile-1.8.7/libguile/scmconfig.h.mlib 2009-07-16 18:06:48.000000000 +0200
|
|
|
90e274 |
@@ -0,0 +1,6 @@
|
|
|
90e274 |
+#include <bits/wordsize.h>
|
|
|
90e274 |
+#if __WORDSIZE == 32
|
|
|
90e274 |
+#include "libguile/scmconfig-32.h"
|
|
|
90e274 |
+#else
|
|
|
90e274 |
+#include "libguile/scmconfig-64.h"
|
|
|
90e274 |
+#endif
|