the Fink project is an effort to port
popular Unix programs to Mac OS X
Package: guile16
Version: 1.6.7
Revision: 1013
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006)
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r)
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
Source-MD5: c2ff2a2231f0cbb2e838dd8701a587c5
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
<<
ConfigureParams: --infodir=%p/share/info --program-transform-name="s|guile|guile\-1\.6|g" --disable-dependency-tracking
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -Dmacosx
CompileScript: <<
#! /bin/sh -ex
export LIBRARY_PATH=%p/lib
export CPATH=%p/include
./configure %c
echo "#undef LTDL_DLOPEN_DEPLIBS" >> config.h
echo "#define LTDL_SHLIB_EXT \".so\"" >> config.h
make
<<
InstallScript: <<
make -j1 install DESTDIR=%d
install -m 755 guile16-build %i/bin/guile16-build
mkdir -p %i/share/guile/1.6/scripts/binoverride
ln -s %p/bin/guile-1.6 %i/share/guile/1.6/scripts/binoverride/guile
ln -s %p/bin/guile-1.6-config %i/share/guile/1.6/scripts/binoverride/guile-config
ln -s %p/bin/guile-1.6-tools %i/share/guile/1.6/scripts/binoverride/guile-tools
ln -s %p/bin/guile-1.6-snarf %i/share/guile/1.6/scripts/binoverride/guile-snarf
<<
SplitOff: <<
Package: %N-shlibs
Depends: libncurses5-shlibs (>= 5.4-20041023-1006)
Files: <<
lib/libguile.*.dylib
lib/libguile-ltdl.1.0.0.dylib
lib/libguile-ltdl.1.dylib
<<
DocFiles: COPYING
Shlibs: <<
%p/lib/libguile.12.dylib 16.0.0 %n (>= 1.6.3-1)
%p/lib/libguile-ltdl.1.dylib 2.0.0 %n (>= 1.6.3-1)
<<
Description: Shared libraries for guile16
<<
SplitOff2: <<
Package: %N-libs
Files: <<
lib/libguile-srfi-srfi-13-14-v-1.*
lib/libguile-srfi-srfi-4-v-1.*
lib/libguilereadline-v-12.*
share/guile/1.6
<<
DocFiles: COPYING
Depends: readline5-shlibs (>= 5.0-1004), %N-shlibs (= %v-%r)
Description: Scheme libraries and modules for guile16
<<
SplitOff3: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: guile-dev, guile18-dev
Conflicts: guile-dev, guile18-dev
Files: <<
include
share/aclocal
lib/libguile.a
lib/libguile.la
lib/libguile.dylib
lib/libguile-ltdl.dylib
lib/libguile-ltdl.la
lib/libguile-ltdl.a
<<
DocFiles: COPYING
Description: Development package for guile16
<<
SplitOff4: <<
Package: %N-doc
Conflicts: guile18-doc, guile16 (<= 1.6.7-1011)
Replaces: guile18-doc, guile16 (<= 1.6.7-1011)
DocFiles: COPYING
Files: share/info
InfoDocs: guile.info guile-tut.info goops.info r5rs.info
Description: Texinfo documentation files for guile16
<<
DocFiles: README COPYING AUTHORS HACKING NEWS THANKS
#
Description: Embedable Scheme interpreter
DescPort: <<
Thread support currently disabled (configure's default).
"borrowed" a patch from darwinports to posix.c makes it
pass make check.
Patched libtool to make it build two level namespace and
ensure it links against the just built libs.
Patched makefiles to replace -export-dynamic with -module.
Made the main packages not conflict with guile-1.4
Make sure to declare the darwinish _environ symbol before using it.
<<
License: GPL
Homepage: http://www.gnu.org/software/guile/guile.html
Maintainer: None
diff -urN guile-1.6.7.orig/configure guile-1.6.7/configure
--- guile-1.6.7.orig/configure 2004-11-12 12:45:58.000000000 +0900
+++ guile-1.6.7/configure 2005-02-28 23:08:00.000000000 +0900
@@ -5302,6 +5302,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
+ lt_cv_deplibs_check_method=pass_all
;;
irix5* | irix6* | nonstopux*)
diff -urN guile-1.6.7.orig/guile-config/guile-config.in guile-1.6.7/guile-config/guile-config.in
--- guile-1.6.7.orig/guile-config/guile-config.in 2002-12-08 07:41:30.000000000 +0900
+++ guile-1.6.7/guile-config/guile-config.in 2005-02-28 23:08:00.000000000 +0900
@@ -1,4 +1,4 @@
-#!@-bindir-@/guile \
+#!@-bindir-@/guile-1.6 \
-e main -s
!#
;;;; guile-config --- utility for linking programs with Guile
diff -urN guile-1.6.7.orig/guile-config/guile.m4 guile-1.6.7/guile-config/guile.m4
--- guile-1.6.7.orig/guile-config/guile.m4 2002-12-08 07:41:30.000000000 +0900
+++ guile-1.6.7/guile-config/guile.m4 2005-02-28 23:08:00.000000000 +0900
@@ -72,17 +72,17 @@
# The variables are marked for substitution, as by @code{AC_SUBST}.
#
AC_DEFUN([GUILE_PROGS],
- [AC_PATH_PROG(GUILE,guile)
+ [AC_PATH_PROG(GUILE,guile-1.6)
if test "$GUILE" = "" ; then
AC_MSG_ERROR([guile required but not found])
fi
AC_SUBST(GUILE)
- AC_PATH_PROG(GUILE_CONFIG,guile-config)
+ AC_PATH_PROG(GUILE_CONFIG,guile-1.6-config)
if test "$GUILE_CONFIG" = "" ; then
AC_MSG_ERROR([guile-config required but not found])
fi
AC_SUBST(GUILE_CONFIG)
- AC_PATH_PROG(GUILE_TOOLS,guile-tools)
+ AC_PATH_PROG(GUILE_TOOLS,guile-1.6-tools)
AC_SUBST(GUILE_TOOLS)
])
diff -urN guile-1.6.7.orig/guile-readline/Makefile.in guile-1.6.7/guile-readline/Makefile.in
--- guile-1.6.7.orig/guile-readline/Makefile.in 2004-12-22 02:34:31.000000000 +0900
+++ guile-1.6.7/guile-readline/Makefile.in 2005-02-28 23:08:00.000000000 +0900
@@ -213,9 +213,9 @@
GUILE_SNARF = ../libguile/guile-snarf
lib_LTLIBRARIES = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la ../libguile-ltdl/libguile-ltdl.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \
- -export-dynamic -no-undefined
+ -module -no-undefined
BUILT_SOURCES = readline.x
pkginclude_HEADERS = readline.h
diff -urN guile-1.6.7.orig/guile-readline/configure guile-1.6.7/guile-readline/configure
--- guile-1.6.7.orig/guile-readline/configure 2004-11-12 12:46:13.000000000 +0900
+++ guile-1.6.7/guile-readline/configure 2005-02-28 23:08:00.000000000 +0900
@@ -4324,6 +4324,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
+ lt_cv_deplibs_check_method=pass_all
;;
irix5* | irix6* | nonstopux*)
diff -urN guile-1.6.7.orig/guile16-build guile-1.6.7/guile16-build
--- guile-1.6.7.orig/guile16-build 1970-01-01 09:00:00.000000000 +0900
+++ guile-1.6.7/guile16-build 2005-02-28 23:08:00.000000000 +0900
@@ -0,0 +1,10 @@
+#! /bin/sh
+GUILE=guile-1.6
+GUILE_CONFIG=guile-1.6-config
+GUILE_TOOLS=guile-1.6-tools
+PATH="@FINKPREFIX@/share/guile/1.6/scripts/binoverride:$PATH"
+export GUILE
+export GUILE_CONFIG
+export GUILE_TOOLS
+export PATH
+eval "$@"
diff -urN guile-1.6.7.orig/libguile/posix.c guile-1.6.7/libguile/posix.c
--- guile-1.6.7.orig/libguile/posix.c 2004-12-14 00:21:39.000000000 -0500
+++ guile-1.6.7/libguile/posix.c 2006-08-22 20:11:16.000000000 -0400
@@ -117,7 +117,17 @@
#include
+#if HAVE_CRT_EXTERNS_H
+#include
+#endif
+/* On Apple Darwin in a shared library there's no "environ" to access
+ directly, instead the address of that variable must be obtained with
+ _NSGetEnviron(). */
+#if HAVE__NSGETENVIRON
+#define environ (*_NSGetEnviron())
+#else
extern char ** environ;
+#endif
#ifdef HAVE_GRP_H
#include
@@ -159,9 +169,6 @@
# include
#endif
-#if HAVE_CRT_EXTERNS_H
-#include
-#endif
/* Some Unix systems don't define these. CPP hair is dangerous, but
this seems safe enough... */
@@ -200,12 +207,6 @@
above means that _POSIX_SOURCE may be #defined, which will
encourage header files to do strange things. */
-/* On Apple Darwin in a shared library there's no "environ" to access
- directly, instead the address of that variable must be obtained with
- _NSGetEnviron(). */
-#if HAVE__NSGETENVIRON && defined (PIC)
-#define environ (*_NSGetEnviron())
-#endif
SCM_SYMBOL (sym_read_pipe, "read pipe");
@@ -1257,6 +1258,13 @@
SCM_MEMORY_ERROR;
strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
ptr[SCM_STRING_LENGTH (str)] = 0;
+#if defined(macosx)
+ if (!strchr(ptr, '=')) {
+ unsetenv(ptr);
+ rv = 0;
+ }
+ else
+#endif
rv = putenv (ptr);
if (rv < 0)
SCM_SYSERROR;
diff -urN guile-1.6.7.orig/libguile-ltdl/raw-ltdl.c guile-1.6.7/libguile-ltdl/raw-ltdl.c
--- guile-1.6.7.orig/libguile-ltdl/raw-ltdl.c 2003-10-13 03:13:32.000000000 +0900
+++ guile-1.6.7/libguile-ltdl/raw-ltdl.c 2005-02-28 23:08:00.000000000 +0900
@@ -3106,6 +3106,7 @@
char * deplibs = 0;
char * line = 0;
size_t line_len;
+ char * finksearchpath = "@FINKPREFIX@/lib";
/* if we can't find the installed flag, it is probably an
installed libtool archive, produced with an old version
@@ -3166,6 +3167,12 @@
file = find_file (search_path, base_name, &dir);
}
#endif
+#if 1
+ if (!file && finksearchpath)
+ {
+ file = find_file (finksearchpath, base_name, &dir);
+ }
+#endif
#ifdef LTDL_SYSSEARCHPATH
if (!file && sys_search_path)
{
diff -urN guile-1.6.7.orig/ltmain.sh guile-1.6.7/ltmain.sh
--- guile-1.6.7.orig/ltmain.sh 2004-12-22 02:25:54.000000000 +0900
+++ guile-1.6.7/ltmain.sh 2005-02-28 23:08:00.000000000 +0900
@@ -2272,7 +2272,7 @@
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ need_relink=no
fi
# This is a shared library
diff -urN guile-1.6.7.orig/pre-inst-guile.in guile-1.6.7/pre-inst-guile.in
--- guile-1.6.7.orig/pre-inst-guile.in 2004-12-14 13:55:40.000000000 +0900
+++ guile-1.6.7/pre-inst-guile.in 2005-02-28 23:08:00.000000000 +0900
@@ -50,6 +50,23 @@
exit 1
}
+# the load library path is needed during the install phase (when guile looks
+# for libraries in $prefix/lib, but they have not been installed yet)
+
+guile_libdir="${top_srcdir}/libguile/.libs:${top_srcdir}/libguile-ltdl/.libs"
+
+# handle DYLD_LIBRARY_PATH (no clobber)
+if [ x"$DYLD_LIBRARY_PATH" = x ] ; then
+ DYLD_LIBRARY_PATH="${guile_libdir}"
+else
+ # This hair prevents double inclusion.
+ # The ":" prevents prefix aliasing.
+ case x"$DYLD_LIBRARY_PATH" in x*${guile_libdir}:*) ;;
+ *) DYLD_LIBRARY_PATH="${guile_libdir}:$DYLD_LIBRARY_PATH" ;;
+ esac
+fi
+export DYLD_LIBRARY_PATH
+
# handle GUILE_LOAD_PATH (no clobber)
if [ x"$GUILE_LOAD_PATH" = x ]
then
diff -urN guile-1.6.7.orig/scripts/PROGRAM guile-1.6.7/scripts/PROGRAM
--- guile-1.6.7.orig/scripts/PROGRAM 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/PROGRAM 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; PROGRAM --- Does something
diff -urN guile-1.6.7.orig/scripts/README guile-1.6.7/scripts/README
--- guile-1.6.7.orig/scripts/README 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/README 2005-02-28 23:08:00.000000000 +0900
@@ -65,7 +65,7 @@
#!/bin/sh
main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
- exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+ exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
Following these conventions allows the program file to be used as module
diff -urN guile-1.6.7.orig/scripts/autofrisk guile-1.6.7/scripts/autofrisk
--- guile-1.6.7.orig/scripts/autofrisk 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/autofrisk 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts autofrisk)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; autofrisk --- Generate module checks for use with auto* tools
diff -urN guile-1.6.7.orig/scripts/display-commentary guile-1.6.7/scripts/display-commentary
--- guile-1.6.7.orig/scripts/display-commentary 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/display-commentary 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts display-commentary)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; display-commentary --- As advertized
diff -urN guile-1.6.7.orig/scripts/doc-snarf guile-1.6.7/scripts/doc-snarf
--- guile-1.6.7.orig/scripts/doc-snarf 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/doc-snarf 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts doc-snarf)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; doc-snarf --- Extract documentation from source files
diff -urN guile-1.6.7.orig/scripts/frisk guile-1.6.7/scripts/frisk
--- guile-1.6.7.orig/scripts/frisk 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/frisk 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts frisk)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; frisk --- Grok the module interfaces of a body of files
diff -urN guile-1.6.7.orig/scripts/generate-autoload guile-1.6.7/scripts/generate-autoload
--- guile-1.6.7.orig/scripts/generate-autoload 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/generate-autoload 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts generate-autoload)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; generate-autoload --- Display define-module form with autoload info
diff -urN guile-1.6.7.orig/scripts/lint guile-1.6.7/scripts/lint
--- guile-1.6.7.orig/scripts/lint 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/lint 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts lint)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; lint --- Preemptive checks for coding errors in Guile Scheme code
diff -urN guile-1.6.7.orig/scripts/punify guile-1.6.7/scripts/punify
--- guile-1.6.7.orig/scripts/punify 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/punify 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts punify)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; punify --- Display Scheme code w/o unnecessary comments / whitespace
diff -urN guile-1.6.7.orig/scripts/read-scheme-source guile-1.6.7/scripts/read-scheme-source
--- guile-1.6.7.orig/scripts/read-scheme-source 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/read-scheme-source 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts read-scheme-source)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; read-scheme-source --- Read a file, recognizing scheme forms and comments
diff -urN guile-1.6.7.orig/scripts/snarf-check-and-output-texi guile-1.6.7/scripts/snarf-check-and-output-texi
--- guile-1.6.7.orig/scripts/snarf-check-and-output-texi 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/snarf-check-and-output-texi 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main="(module-ref (resolve-module '(scripts snarf-check-and-output-texi)) 'main)"
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; snarf-check-and-output-texi --- called by the doc snarfer.
diff -urN guile-1.6.7.orig/scripts/snarf-guile-m4-docs guile-1.6.7/scripts/snarf-guile-m4-docs
--- guile-1.6.7.orig/scripts/snarf-guile-m4-docs 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/snarf-guile-m4-docs 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts snarf-guile-m4-docs)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; snarf-guile-m4-docs --- Parse guile.m4 comments for texi documentation
diff -urN guile-1.6.7.orig/scripts/use2dot guile-1.6.7/scripts/use2dot
--- guile-1.6.7.orig/scripts/use2dot 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/use2dot 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts use2dot)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; use2dot --- Display module dependencies as a DOT specification
diff -urN guile-1.6.7.orig/srfi/Makefile.in guile-1.6.7/srfi/Makefile.in
--- guile-1.6.7.orig/srfi/Makefile.in 2004-12-22 02:26:03.000000000 +0900
+++ guile-1.6.7/srfi/Makefile.in 2005-03-01 00:08:11.000000000 +0900
@@ -262,13 +262,13 @@
nodist_libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x
libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la
libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -export-dynamic \
- -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
+ -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@ -module
libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.c srfi-14.c
nodist_libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-14.x
libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la
libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -export-dynamic \
- -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
+ -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@ -module
srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
srfi_DATA = \
--- guile-1.6.7/libguile/guile.c~ 2002-12-08 07:41:32.000000000 +0900
+++ guile-1.6.7/libguile/guile.c 2005-06-09 21:54:01.000000000 +0900
@@ -88,7 +88,7 @@
{
#ifdef DYNAMIC_LINKING
/* libtool automagically inserts this variable into your executable... */
- extern const scm_lt_dlsymlist lt_preloaded_symbols[];
+ extern const scm_lt_dlsymlist *lt_preloaded_symbols;
scm_lt_dlpreload_default (lt_preloaded_symbols);
#endif
scm_boot_guile (argc, argv, inner_main, 0);
Package: guile16
Version: 1.6.7
Revision: 1013
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r)
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
Source-MD5: c2ff2a2231f0cbb2e838dd8701a587c5
PatchFile: %n.patch
PatchFile-MD5: 3e1ae5d38b60d65e584f7ed4c0a7be43
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' <%{PatchFile} | patch -p1
<<
ConfigureParams: --infodir=%p/share/info --program-transform-name="s|guile|guile\-1\.6|g" --disable-dependency-tracking
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -Dmacosx
CompileScript: <<
#! /bin/sh -ex
export LIBRARY_PATH=%p/lib
export CPATH=%p/include
./configure %c
echo "#undef LTDL_DLOPEN_DEPLIBS" >> config.h
echo "#define LTDL_SHLIB_EXT \".so\"" >> config.h
make
<<
InstallScript: <<
make -j1 install DESTDIR=%d
install -m 755 guile16-build %i/bin/guile16-build
mkdir -p %i/share/guile/1.6/scripts/binoverride
ln -s %p/bin/guile-1.6 %i/share/guile/1.6/scripts/binoverride/guile
ln -s %p/bin/guile-1.6-config %i/share/guile/1.6/scripts/binoverride/guile-config
ln -s %p/bin/guile-1.6-tools %i/share/guile/1.6/scripts/binoverride/guile-tools
ln -s %p/bin/guile-1.6-snarf %i/share/guile/1.6/scripts/binoverride/guile-snarf
<<
SplitOff: <<
Package: %N-shlibs
Depends: libncurses5-shlibs (>= 5.4-20041023-1006)
Files: <<
lib/libguile.*.dylib
lib/libguile-ltdl.1.0.0.dylib
lib/libguile-ltdl.1.dylib
<<
DocFiles: COPYING
Shlibs: <<
%p/lib/libguile.12.dylib 16.0.0 %n (>= 1.6.3-1)
%p/lib/libguile-ltdl.1.dylib 2.0.0 %n (>= 1.6.3-1)
<<
Description: Shared libraries for guile16
<<
SplitOff2: <<
Package: %N-libs
Files: <<
lib/libguile-srfi-srfi-13-14-v-1.*
lib/libguile-srfi-srfi-4-v-1.*
lib/libguilereadline-v-12.*
share/guile/1.6
<<
DocFiles: COPYING
Depends: readline5-shlibs (>= 5.0-1004), %N-shlibs (= %v-%r)
Description: Scheme libraries and modules for guile16
<<
SplitOff3: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: guile-dev, guile18-dev
Conflicts: guile-dev, guile18-dev
Files: <<
include
share/aclocal
lib/libguile.a
lib/libguile.la
lib/libguile.dylib
lib/libguile-ltdl.dylib
lib/libguile-ltdl.la
lib/libguile-ltdl.a
<<
DocFiles: COPYING
Description: Development package for guile16
<<
SplitOff4: <<
Package: %N-doc
Conflicts: guile18-doc, guile16 (<= 1.6.7-1011)
Replaces: guile18-doc, guile16 (<= 1.6.7-1011)
DocFiles: COPYING
Files: share/info
InfoDocs: guile.info guile-tut.info goops.info r5rs.info
Description: Texinfo documentation files for guile16
<<
DocFiles: README COPYING AUTHORS HACKING NEWS THANKS
#
Description: Embedable Scheme interpreter
DescPort: <<
Thread support currently disabled (configure's default).
"borrowed" a patch from darwinports to posix.c makes it
pass make check.
Patched libtool to make it build two level namespace and
ensure it links against the just built libs.
Patched makefiles to replace -export-dynamic with -module.
Made the main packages not conflict with guile-1.4
Make sure to declare the darwinish _environ symbol before using it.
<<
License: GPL
Homepage: http://www.gnu.org/software/guile/guile.html
Maintainer: None
diff -urN guile-1.6.7.orig/configure guile-1.6.7/configure
--- guile-1.6.7.orig/configure 2004-11-12 12:45:58.000000000 +0900
+++ guile-1.6.7/configure 2005-02-28 23:08:00.000000000 +0900
@@ -5302,6 +5302,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
+ lt_cv_deplibs_check_method=pass_all
;;
irix5* | irix6* | nonstopux*)
diff -urN guile-1.6.7.orig/guile-config/guile-config.in guile-1.6.7/guile-config/guile-config.in
--- guile-1.6.7.orig/guile-config/guile-config.in 2002-12-08 07:41:30.000000000 +0900
+++ guile-1.6.7/guile-config/guile-config.in 2005-02-28 23:08:00.000000000 +0900
@@ -1,4 +1,4 @@
-#!@-bindir-@/guile \
+#!@-bindir-@/guile-1.6 \
-e main -s
!#
;;;; guile-config --- utility for linking programs with Guile
diff -urN guile-1.6.7.orig/guile-config/guile.m4 guile-1.6.7/guile-config/guile.m4
--- guile-1.6.7.orig/guile-config/guile.m4 2002-12-08 07:41:30.000000000 +0900
+++ guile-1.6.7/guile-config/guile.m4 2005-02-28 23:08:00.000000000 +0900
@@ -72,17 +72,17 @@
# The variables are marked for substitution, as by @code{AC_SUBST}.
#
AC_DEFUN([GUILE_PROGS],
- [AC_PATH_PROG(GUILE,guile)
+ [AC_PATH_PROG(GUILE,guile-1.6)
if test "$GUILE" = "" ; then
AC_MSG_ERROR([guile required but not found])
fi
AC_SUBST(GUILE)
- AC_PATH_PROG(GUILE_CONFIG,guile-config)
+ AC_PATH_PROG(GUILE_CONFIG,guile-1.6-config)
if test "$GUILE_CONFIG" = "" ; then
AC_MSG_ERROR([guile-config required but not found])
fi
AC_SUBST(GUILE_CONFIG)
- AC_PATH_PROG(GUILE_TOOLS,guile-tools)
+ AC_PATH_PROG(GUILE_TOOLS,guile-1.6-tools)
AC_SUBST(GUILE_TOOLS)
])
diff -urN guile-1.6.7.orig/guile-readline/Makefile.in guile-1.6.7/guile-readline/Makefile.in
--- guile-1.6.7.orig/guile-readline/Makefile.in 2004-12-22 02:34:31.000000000 +0900
+++ guile-1.6.7/guile-readline/Makefile.in 2005-02-28 23:08:00.000000000 +0900
@@ -213,9 +213,9 @@
GUILE_SNARF = ../libguile/guile-snarf
lib_LTLIBRARIES = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la ../libguile-ltdl/libguile-ltdl.la
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \
- -export-dynamic -no-undefined
+ -module -no-undefined
BUILT_SOURCES = readline.x
pkginclude_HEADERS = readline.h
diff -urN guile-1.6.7.orig/guile-readline/configure guile-1.6.7/guile-readline/configure
--- guile-1.6.7.orig/guile-readline/configure 2004-11-12 12:46:13.000000000 +0900
+++ guile-1.6.7/guile-readline/configure 2005-02-28 23:08:00.000000000 +0900
@@ -4324,6 +4324,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
+ lt_cv_deplibs_check_method=pass_all
;;
irix5* | irix6* | nonstopux*)
diff -urN guile-1.6.7.orig/guile16-build guile-1.6.7/guile16-build
--- guile-1.6.7.orig/guile16-build 1970-01-01 09:00:00.000000000 +0900
+++ guile-1.6.7/guile16-build 2005-02-28 23:08:00.000000000 +0900
@@ -0,0 +1,10 @@
+#! /bin/sh
+GUILE=guile-1.6
+GUILE_CONFIG=guile-1.6-config
+GUILE_TOOLS=guile-1.6-tools
+PATH="@FINKPREFIX@/share/guile/1.6/scripts/binoverride:$PATH"
+export GUILE
+export GUILE_CONFIG
+export GUILE_TOOLS
+export PATH
+eval "$@"
diff -urN guile-1.6.7.orig/libguile/posix.c guile-1.6.7/libguile/posix.c
--- guile-1.6.7.orig/libguile/posix.c 2004-12-14 00:21:39.000000000 -0500
+++ guile-1.6.7/libguile/posix.c 2006-08-22 20:11:16.000000000 -0400
@@ -117,7 +117,17 @@
#include
+#if HAVE_CRT_EXTERNS_H
+#include
+#endif
+/* On Apple Darwin in a shared library there's no "environ" to access
+ directly, instead the address of that variable must be obtained with
+ _NSGetEnviron(). */
+#if HAVE__NSGETENVIRON
+#define environ (*_NSGetEnviron())
+#else
extern char ** environ;
+#endif
#ifdef HAVE_GRP_H
#include
@@ -159,9 +169,6 @@
# include
#endif
-#if HAVE_CRT_EXTERNS_H
-#include
-#endif
/* Some Unix systems don't define these. CPP hair is dangerous, but
this seems safe enough... */
@@ -200,12 +207,6 @@
above means that _POSIX_SOURCE may be #defined, which will
encourage header files to do strange things. */
-/* On Apple Darwin in a shared library there's no "environ" to access
- directly, instead the address of that variable must be obtained with
- _NSGetEnviron(). */
-#if HAVE__NSGETENVIRON && defined (PIC)
-#define environ (*_NSGetEnviron())
-#endif
SCM_SYMBOL (sym_read_pipe, "read pipe");
@@ -1257,6 +1258,13 @@
SCM_MEMORY_ERROR;
strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
ptr[SCM_STRING_LENGTH (str)] = 0;
+#if defined(macosx)
+ if (!strchr(ptr, '=')) {
+ unsetenv(ptr);
+ rv = 0;
+ }
+ else
+#endif
rv = putenv (ptr);
if (rv < 0)
SCM_SYSERROR;
diff -urN guile-1.6.7.orig/libguile-ltdl/raw-ltdl.c guile-1.6.7/libguile-ltdl/raw-ltdl.c
--- guile-1.6.7.orig/libguile-ltdl/raw-ltdl.c 2003-10-13 03:13:32.000000000 +0900
+++ guile-1.6.7/libguile-ltdl/raw-ltdl.c 2005-02-28 23:08:00.000000000 +0900
@@ -3106,6 +3106,7 @@
char * deplibs = 0;
char * line = 0;
size_t line_len;
+ char * finksearchpath = "@FINKPREFIX@/lib";
/* if we can't find the installed flag, it is probably an
installed libtool archive, produced with an old version
@@ -3166,6 +3167,12 @@
file = find_file (search_path, base_name, &dir);
}
#endif
+#if 1
+ if (!file && finksearchpath)
+ {
+ file = find_file (finksearchpath, base_name, &dir);
+ }
+#endif
#ifdef LTDL_SYSSEARCHPATH
if (!file && sys_search_path)
{
diff -urN guile-1.6.7.orig/ltmain.sh guile-1.6.7/ltmain.sh
--- guile-1.6.7.orig/ltmain.sh 2004-12-22 02:25:54.000000000 +0900
+++ guile-1.6.7/ltmain.sh 2005-02-28 23:08:00.000000000 +0900
@@ -2272,7 +2272,7 @@
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ need_relink=no
fi
# This is a shared library
diff -urN guile-1.6.7.orig/pre-inst-guile.in guile-1.6.7/pre-inst-guile.in
--- guile-1.6.7.orig/pre-inst-guile.in 2004-12-14 13:55:40.000000000 +0900
+++ guile-1.6.7/pre-inst-guile.in 2005-02-28 23:08:00.000000000 +0900
@@ -50,6 +50,23 @@
exit 1
}
+# the load library path is needed during the install phase (when guile looks
+# for libraries in $prefix/lib, but they have not been installed yet)
+
+guile_libdir="${top_srcdir}/libguile/.libs:${top_srcdir}/libguile-ltdl/.libs"
+
+# handle DYLD_LIBRARY_PATH (no clobber)
+if [ x"$DYLD_LIBRARY_PATH" = x ] ; then
+ DYLD_LIBRARY_PATH="${guile_libdir}"
+else
+ # This hair prevents double inclusion.
+ # The ":" prevents prefix aliasing.
+ case x"$DYLD_LIBRARY_PATH" in x*${guile_libdir}:*) ;;
+ *) DYLD_LIBRARY_PATH="${guile_libdir}:$DYLD_LIBRARY_PATH" ;;
+ esac
+fi
+export DYLD_LIBRARY_PATH
+
# handle GUILE_LOAD_PATH (no clobber)
if [ x"$GUILE_LOAD_PATH" = x ]
then
diff -urN guile-1.6.7.orig/scripts/PROGRAM guile-1.6.7/scripts/PROGRAM
--- guile-1.6.7.orig/scripts/PROGRAM 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/PROGRAM 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; PROGRAM --- Does something
diff -urN guile-1.6.7.orig/scripts/README guile-1.6.7/scripts/README
--- guile-1.6.7.orig/scripts/README 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/README 2005-02-28 23:08:00.000000000 +0900
@@ -65,7 +65,7 @@
#!/bin/sh
main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
- exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+ exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
Following these conventions allows the program file to be used as module
diff -urN guile-1.6.7.orig/scripts/autofrisk guile-1.6.7/scripts/autofrisk
--- guile-1.6.7.orig/scripts/autofrisk 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/autofrisk 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts autofrisk)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; autofrisk --- Generate module checks for use with auto* tools
diff -urN guile-1.6.7.orig/scripts/display-commentary guile-1.6.7/scripts/display-commentary
--- guile-1.6.7.orig/scripts/display-commentary 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/display-commentary 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts display-commentary)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; display-commentary --- As advertized
diff -urN guile-1.6.7.orig/scripts/doc-snarf guile-1.6.7/scripts/doc-snarf
--- guile-1.6.7.orig/scripts/doc-snarf 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/doc-snarf 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts doc-snarf)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; doc-snarf --- Extract documentation from source files
diff -urN guile-1.6.7.orig/scripts/frisk guile-1.6.7/scripts/frisk
--- guile-1.6.7.orig/scripts/frisk 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/frisk 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts frisk)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; frisk --- Grok the module interfaces of a body of files
diff -urN guile-1.6.7.orig/scripts/generate-autoload guile-1.6.7/scripts/generate-autoload
--- guile-1.6.7.orig/scripts/generate-autoload 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/generate-autoload 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts generate-autoload)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; generate-autoload --- Display define-module form with autoload info
diff -urN guile-1.6.7.orig/scripts/lint guile-1.6.7/scripts/lint
--- guile-1.6.7.orig/scripts/lint 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/lint 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts lint)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; lint --- Preemptive checks for coding errors in Guile Scheme code
diff -urN guile-1.6.7.orig/scripts/punify guile-1.6.7/scripts/punify
--- guile-1.6.7.orig/scripts/punify 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/punify 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts punify)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; punify --- Display Scheme code w/o unnecessary comments / whitespace
diff -urN guile-1.6.7.orig/scripts/read-scheme-source guile-1.6.7/scripts/read-scheme-source
--- guile-1.6.7.orig/scripts/read-scheme-source 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/read-scheme-source 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts read-scheme-source)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; read-scheme-source --- Read a file, recognizing scheme forms and comments
diff -urN guile-1.6.7.orig/scripts/snarf-check-and-output-texi guile-1.6.7/scripts/snarf-check-and-output-texi
--- guile-1.6.7.orig/scripts/snarf-check-and-output-texi 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/snarf-check-and-output-texi 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main="(module-ref (resolve-module '(scripts snarf-check-and-output-texi)) 'main)"
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; snarf-check-and-output-texi --- called by the doc snarfer.
diff -urN guile-1.6.7.orig/scripts/snarf-guile-m4-docs guile-1.6.7/scripts/snarf-guile-m4-docs
--- guile-1.6.7.orig/scripts/snarf-guile-m4-docs 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/snarf-guile-m4-docs 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts snarf-guile-m4-docs)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; snarf-guile-m4-docs --- Parse guile.m4 comments for texi documentation
diff -urN guile-1.6.7.orig/scripts/use2dot guile-1.6.7/scripts/use2dot
--- guile-1.6.7.orig/scripts/use2dot 2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/use2dot 2005-02-28 23:08:00.000000000 +0900
@@ -1,7 +1,7 @@
#!/bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(scripts use2dot)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
!#
;;; use2dot --- Display module dependencies as a DOT specification
diff -urN guile-1.6.7.orig/srfi/Makefile.in guile-1.6.7/srfi/Makefile.in
--- guile-1.6.7.orig/srfi/Makefile.in 2004-12-22 02:26:03.000000000 +0900
+++ guile-1.6.7/srfi/Makefile.in 2005-03-01 00:08:11.000000000 +0900
@@ -262,13 +262,13 @@
nodist_libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x
libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la
libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -export-dynamic \
- -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
+ -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@ -module
libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.c srfi-14.c
nodist_libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-14.x
libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la
libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -export-dynamic \
- -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
+ -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@ -module
srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
srfi_DATA = \
--- guile-1.6.7/libguile/guile.c~ 2002-12-08 07:41:32.000000000 +0900
+++ guile-1.6.7/libguile/guile.c 2005-06-09 21:54:01.000000000 +0900
@@ -88,7 +88,7 @@
{
#ifdef DYNAMIC_LINKING
/* libtool automagically inserts this variable into your executable... */
- extern const scm_lt_dlsymlist lt_preloaded_symbols[];
+ extern const scm_lt_dlsymlist *lt_preloaded_symbols;
scm_lt_dlpreload_default (lt_preloaded_symbols);
#endif
scm_boot_guile (argc, argv, inner_main, 0);