# HG changeset patch
# User Jan Nieuwenhuizen <janneke@gnu.org>
# Date 1296482612 -3600
# Node ID a2efa3f96861beba2d8ad6bd97689eb9550fbb3a
# Parent  af582a313c6042311913b656f516ebabbd754aaa
guile: cross build and mingw fork fixes.

diff -r af582a313c60 -r a2efa3f96861 gub/specs/guile.py
--- a/gub/specs/guile.py	Mon Jan 31 15:03:06 2011 +0100
+++ b/gub/specs/guile.py	Mon Jan 31 15:03:32 2011 +0100
@@ -187,8 +187,8 @@
         for libtool in ['%(builddir)s/libtool']: # readline patched-out: '%(builddir)s/guile-readline/libtool']:
             self.file_sub ([('-mwindows', '')], libtool)
     def patch (self):
+        self.system ('cd %(srcdir)s && gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --libtool --macro-prefix=gl --no-vc-files alignof alloca-opt announce-gen autobuild byteswap canonicalize-lgpl duplocale environ extensions flock fpieee full-read full-write func gendocs getaddrinfo git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan lib-symbol-versions lib-symbol-visibility libunistring locale maintainer-makefile nproc putenv stat-time stdlib strcase strftime striconveh string sys_stat verify version-etc-fsf vsnprintf warnings     accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket || :')
         Guile.patch (self)
-        self.system ('cd %(srcdir)s && gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --libtool --macro-prefix=gl --no-vc-files alignof alloca-opt announce-gen autobuild byteswap canonicalize-lgpl duplocale environ extensions flock fpieee full-read full-write func gendocs getaddrinfo git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan lib-symbol-versions lib-symbol-visibility libunistring locale maintainer-makefile nproc putenv stat-time stdlib strcase strftime striconveh string sys_stat verify version-etc-fsf vsnprintf warnings     accept bind close connect getpeername getsockname getsockopt listen recv recv recvfrom send sendto setsockopt shutdown socket || :')
     def compile (self):
         ## Why the !?#@$ is .EXE only for guile_filter_doc_snarfage?
         self.system ('''cd %(builddir)s/libguile &&make %(compile_flags_native)sgen-scmconfig guile_filter_doc_snarfage.exe''')
diff -r af582a313c60 -r a2efa3f96861 patches/guile-1.9.14-cross.patch
--- a/patches/guile-1.9.14-cross.patch	Mon Jan 31 15:03:06 2011 +0100
+++ b/patches/guile-1.9.14-cross.patch	Mon Jan 31 15:03:32 2011 +0100
@@ -21,3 +21,14 @@
  	am					\
  	doc
  
+--- guile-1.9.14/meta/guile-2.0.pc.in~	2010-12-14 19:15:17.000000000 +0100
++++ guile-1.9.14/meta/guile-2.0.pc.in	2011-01-31 13:39:29.453612101 +0100
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ pkgdatadir=@datadir@/guile
+-pkgincludedir=@includedir@/guile
++pkgincludedir=${includedir}/guile
+ 
+ sitedir=@sitedir@
+ extensiondir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions