From c354070092afca6078bf92406476cd628ae315b9 Mon Sep 17 00:00:00 2001 From: Wolfgang Dautermann Date: Wed, 16 Nov 2022 23:28:35 +0100 Subject: [PATCH] Fix the usage of the self compiled texinfo version. A recent version is needed to build Maxima documentation now. --- crosscompile-windows/CMakeLists.txt | 10 +++++----- crosscompile-windows/README.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crosscompile-windows/CMakeLists.txt b/crosscompile-windows/CMakeLists.txt index b6466d9de..73ed8fe67 100644 --- a/crosscompile-windows/CMakeLists.txt +++ b/crosscompile-windows/CMakeLists.txt @@ -230,14 +230,14 @@ externalproject_add(maxima DEPENDS clisp sbcl tcl tk texinfo ${ABCL_DEPENDS} BUILD_IN_SOURCE 1 CONFIGURE_COMMAND sh -c "test -x ./bootstrap && ./bootstrap || return 0" - COMMAND ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} ./configure --host=${HOST} --enable-clisp --with-clisp=${CMAKE_BINARY_DIR}/wine-clisp.sh --with-clisp-runtime=${CMAKE_BINARY_DIR}/wine-lisp.sh --enable-sbcl --with-sbcl=${CMAKE_BINARY_DIR}/wine-sbcl.sh ${ABCL_ENABLE} "${ABCL_JAR}" --with-default-lisp=${WITH_DEFAULT_LISP} --prefix=${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION} + COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C ./configure --host=${HOST} --enable-clisp --with-clisp=${CMAKE_BINARY_DIR}/wine-clisp.sh --with-clisp-runtime=${CMAKE_BINARY_DIR}/wine-lisp.sh --enable-sbcl --with-sbcl=${CMAKE_BINARY_DIR}/wine-sbcl.sh ${ABCL_ENABLE} "${ABCL_JAR}" --with-default-lisp=${WITH_DEFAULT_LISP} --prefix=${WINDOWS_DRIVELETTER}:/maxima-${MAXIMAVERSION} # clisp-depends.mk is generated with "\" as path separator, not "/" - correct that... BUILD_COMMAND LANG=C $(MAKE) -C src clisp-depends.mk COMMAND sed -i s+\\\\+/+g src/clisp-depends.mk - COMMAND LANG=C ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} $(MAKE) - COMMAND LANG=C ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} $(MAKE) pdf - INSTALL_COMMAND LANG=C $(MAKE) install DESTDIR=${CMAKE_BINARY_DIR}/maxima-installroot/ - COMMAND LANG=C $(MAKE) extradocinstall DESTDIR=${CMAKE_BINARY_DIR}/maxima-installroot/ + COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) + COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) pdf + INSTALL_COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) install DESTDIR=${CMAKE_BINARY_DIR}/maxima-installroot/ + COMMAND PATH=${CMAKE_BINARY_DIR}/texinfo-installroot/bin:$ENV{PATH} LANG=C $(MAKE) extradocinstall DESTDIR=${CMAKE_BINARY_DIR}/maxima-installroot/ ) option(STRIP_HELPERPROGRAMS "Strip the included helper programs (winkill, winkill_lib, maxima_longnames)." YES) diff --git a/crosscompile-windows/README.txt b/crosscompile-windows/README.txt index 938f2206e..6616350a2 100644 --- a/crosscompile-windows/README.txt +++ b/crosscompile-windows/README.txt @@ -3,7 +3,7 @@ Crosscompiling Maxima for Windows On a Ubuntu/Debian System just install some tools for crosscompiling: -apt-get install g++-mingw-w64-x86-64 cmake nsis wine automake texinfo texlive texlive-plain-generic texlive-xetex rsync p7zip-full g++ gettext python3 tcl pandoc po4a +apt-get install g++-mingw-w64-x86-64 cmake nsis wine automake texlive texlive-plain-generic texlive-xetex rsync p7zip-full g++ gettext python3 tcl pandoc po4a The Mingw compiler comes in two flavors for threading (win32 and posix threads). wxMaxima requires posix threads, so you must reconfigure mingw and select the posix -- 2.11.4.GIT