summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/utils/README44
-rw-r--r--Build/source/utils/xindy/README-clisp65
-rw-r--r--Build/source/utils/xindy/tests/idxhello.idx2
-rw-r--r--Build/source/utils/xindy/tests/idxhello.tex13
4 files changed, 44 insertions, 80 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README
index deb6225aad1..7f11dd91150 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -65,32 +65,37 @@ mkdir $clisp_toolsdir
wget=wget # or "curl -O" or whatever
-libsigsegv_ver=libsigsegv-2.10
+libsigsegv_ver=libsigsegv-2.11
cd $clisp_basedir
$wget http://ftp.gnu.org/gnu/libsigsegv/$libsigsegv_ver.tar.gz
gzip -dc $libsigsegv_ver.tar.gz | tar xf -
cd $libsigsegv_ver
-./configure --prefix=$clisp_toolsdir --disable-shared --enable-static \
+./configure -C --prefix=$clisp_toolsdir --disable-shared --enable-static \
&& make && make check && make install
#
# you may need this hack on 64-bit systems
-# if clisp's configure does not find libsigsegv. Harmless anyway.
+# if clisp's configure does not find libsigsegv. Harmless to do in any case.
ln -s lib $clisp_toolsdir/lib64
+#
+# if you can't build libsigsegv, pass --ignore-absence-of-libsigsegv
+# when running configure for clisp.
-libiconv_ver=libiconv-1.14
-cd $clisp_basedir
-$wget http://ftp.gnu.org/gnu/libiconv/$libiconv_ver.tar.gz
-gzip -dc $libiconv_ver.tar.gz | tar xf -
-cd $libiconv_ver
-./configure --prefix=$clisp_toolsdir --disable-shared --enable-static \
-&& make && make check && make install
-
-ffcall_ver=ffcall-1.10
+ffcall_ver=libffcall-1.13-20170225
cd $clisp_basedir
$wget http://www.haible.de/bruno/gnu/$ffcall_ver.tar.gz
gzip -dc $ffcall_ver.tar.gz | tar xf -
cd $ffcall_ver
-./configure --prefix=$clisp_toolsdir --disable-shared --enable-static \
+./configure -C --prefix=$clisp_toolsdir --disable-shared --enable-static \
+&& make && make check && make install
+
+# may be able to omit iconv if have new enough in libc or elsewhere.
+libiconv_ver=libiconv-1.15
+cd $clisp_basedir
+$wget http://ftp.gnu.org/gnu/libiconv/$libiconv_ver.tar.gz
+gzip -dc $libiconv_ver.tar.gz | tar xf -
+cd $libiconv_ver
+./configure -C --prefix=$clisp_toolsdir \
+ --disable-shared --enable-static --disable-nls \
&& make && make check && make install
# would probably be ideal to also do a local libtermcap or ncurses,
@@ -101,8 +106,8 @@ cd $ffcall_ver
clisp_ver=clisp-2.49
cd $clisp_basedir
-$wget http://ftp.gnu.org/gnu/clisp/release/2.49/$clisp_ver.tar.gz
-gzip -dc $clisp_ver.tar.gz | tar xf -
+$wget https://haible.de/bruno/gnu/clisp-2.49.50.tar.bz2
+bunzip2 -dc $clisp_ver.tar.bz2 | tar xf -
cd $clisp_ver
# On Cygwin:
@@ -111,10 +116,11 @@ cd $clisp_ver
# modules/syscalls/configure.orig > modules/syscalls/configure
# On FreeBSD/amd64: add --disable-mmap.
#
-./configure --without-readline --disable-nls \
+./configure CPPFLAGS=-DUNIX_BINARY_DISTRIB --prefix=$clisp_toolsdir \
+ --without-readline --without-dynamic-modules \
+ --disable-nls --enable-portability \
--with-libsigsegv-prefix=$clisp_toolsdir \
- --with-libiconv-prefix=$clisp_toolsdir \
--with-libffcall-prefix=$clisp_toolsdir \
+ --with-libiconv-prefix=$clisp_toolsdir \
$clisp_builddir \
-&& cd $clisp_builddir \
-&& make
+&& (cd $clisp_builddir && make)
diff --git a/Build/source/utils/xindy/README-clisp b/Build/source/utils/xindy/README-clisp
index 10f75b08845..5d9beb44c29 100644
--- a/Build/source/utils/xindy/README-clisp
+++ b/Build/source/utils/xindy/README-clisp
@@ -1,62 +1,5 @@
-Prerequisite for building xindy is the clisp package supporting
-foreign function calls functionality.
+(This file public domain.)
-If your OS distribution already has CLISP installed, xindy will try to
-use it (the configure script searches in PATH to find the `clisp'
-executable, or you can pass the configure option --with-clisp=PATH
-where PATH is an absolute path to the `clisp' executable).
-
-Otherwise, you need to build CLISP from source before building xindy.
-Sources and selected binaries are available by anonymous ftp from
- <ftp://ftp.gnu.org/pub/gnu/clisp/>
-and its mirrors.
-
-Sample steps to build clisp:
-
-=======================================================
-# define this to any directory where clisp should be built, e.g.:
-clisp_builddir=`pwd`/clisp-build-dir
-
-wget http://ftp.gnu.org/pub/gnu/clisp/release/2.43/clisp-2.43.tar.gz
-gzip -dc clisp-2.43.tar.gz | tar xf -
-
-cd clisp-2.43
-./configure $clisp_builddir --ignore-absence-of-libsigsegv
-cd $clisp_builddir
-make
-=======================================================
-
-NOTE: clisp package is only a build-dependency: it is not used by
-xindy at runtime. So clisp could be uninstalled after xindy was built.
-Therefore, running "make install" is not necessary, and you can
-specify --with-clisp=$clisp_builddir/clisp when configuring xindy.
-
-When running `configure' for clisp, the following options should be noted:
-
-=======================================================
- --ignore-absence-of-libsigsegv
-
- You may optionally install libsigsegv to improve clisp's runtime
- behavior. You may get libsigsegv sources from
- http://ftp.gnu.org/pub/gnu/libsigsegv/
-
- If you don't have the libsigsegv library, use the above option to
- let it build without libsigsegv.
-
- --with-libsigsegv-prefix=DIR
- --with-libffcall-prefix=DIR
-
- In case you have installed libffcall or libsigsegv in some
- non-standard locations, use the above options to specify their
- prefix directories (such as /usr/local, /opt or /sw).
-
- --without-readline
-
- It was reported that CLISP fails to build on the MacOS X platform,
- because of the faulty 'readline' package. Use the above option if
- you'll experience problems.
-=======================================================
-
-As noted above, running "make install" for clisp is not necessary, and
-you can specify --with-clisp=$clisp_builddir/clisp when configuring
-xindy.
+GNU clisp (gnu.org/software/clisp) is required by xindy.
+See the end of ../README (that is, Buid/source/utils/README) for
+information on building it.
diff --git a/Build/source/utils/xindy/tests/idxhello.idx b/Build/source/utils/xindy/tests/idxhello.idx
new file mode 100644
index 00000000000..5f3b98d84d0
--- /dev/null
+++ b/Build/source/utils/xindy/tests/idxhello.idx
@@ -0,0 +1,2 @@
+\indexentry{there}{1}
+\indexentry{hello}{1}
diff --git a/Build/source/utils/xindy/tests/idxhello.tex b/Build/source/utils/xindy/tests/idxhello.tex
new file mode 100644
index 00000000000..6c709ae075e
--- /dev/null
+++ b/Build/source/utils/xindy/tests/idxhello.tex
@@ -0,0 +1,13 @@
+% $Id$
+% public domain. minimal index test:
+% latex idxhello && texindy idxhello.idx && cat idxhello.ind # inspect output
+% (or makeindex for that matter.)
+%
+% xindy must be able to find its modules, which in TL means being run
+% out of Master/bin/*.
+%
+\documentclass{article}
+\begin{document}
+\index{xyz}xyz
+\index{abc}abc
+\end{document}