Re: 12 bugfixes patches
Reini Urban <[email protected]>
| Newsgroups | gmane.lisp.clisp.devel |
|---|---|
| Message-ID | <[email protected]> |
One had to be revised: linkkit: copy dlls on windows
See this one instead, not all shells can do ${/}
Reini Urban
[email protected]
> On Mar 22, 2017, at 9:51 PM, Reini Urban <[email protected]> wrote:
>
> See also https://github.com/rurban/clisp/issues
>
> I’m not sure about the makemake: fix clisp.rc for prerelease PRODUCTVERSION patch
> It’s broken, but my shell/sed fu is not quite good enough I guess.
>
> The cygwin/modprep patches are several years old and still needed.
> The win32 patches are needed for the latest mingw64, which my smoker is using now:
> https://ci.appveyor.com/project/rurban/clisp/build/clisp-ci-2.49.50+-109.cf4ec77
> iconv is needed for mac with gnu libiconv.
>
> lightning is a big todo. I wanted to try llvm, but first I thought we have to fix lightning.
> it should be much faster than llvm, I think. compile-time trumps run-time with most calls.
> only with some very often used calls llvm would make sense, I think. Or trace and guard the types,
> and assume the next calls will use the same types and path. (pypy, v8, …)
>
>
> <0001-iconv-even-darwin-might-have-a-GNU_LIBICONV.patch><0002-lightning-fix-jitc_sym_constpr-syntax-error.patch><0003-lightning-protect-from-wrong-versions.patch><0004-configure-typo-exisiting.patch><0005-fix-cygwin-mingw-without-dynamic-modules.patch><0006-makemake-fix-clisp.rc-for-prerelease-PRODUCTVERSION.patch><0007-modprep-add-missing-doc-field-to-funcdef.patch><0008-linkkit-copy-dlls-on-windows.patch><0009-cygwin-fix-UUID-compilation.patch><0010-fix-various-cygwin-tests.patch><0011-win32-ddk-ntifs.h-winternl.h-ntstatus.h.patch><0012-win32-add-I.-for-include-w32shell.c.patch>
>
>
> Reini Urban
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
clisp-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/clisp-devel
0001-linkkit-copy-dlls-on-windows.patch
(application/octet-stream, 1.4 KB)
From 088aaa00f213621b2756776e60e405274ee17d3f Mon Sep 17 00:00:00 2001 From: Reini Urban <[email protected]> Date: Wed, 22 Mar 2017 18:25:34 +0100 Subject: [PATCH] linkkit: copy dlls on windows symlinks are not resolved by the os --- modules/libsvm/Makefile.in | 5 +++++ src/clisp-link.in | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git modules/libsvm/Makefile.in modules/libsvm/Makefile.in index 0f666b725..c5364eac5 100644 --- modules/libsvm/Makefile.in +++ modules/libsvm/Makefile.in @@ -7,7 +7,12 @@ CFLAGS = @CFLAGS@ CLISP = @CLISP@ -norc -q CLISP_LINKKIT = @CLISP_LINKKIT@ +# on windows be sure not to symlink the dll, copy it +ifeq ($(SHREXT), .dll) +LN = cp +else LN = @LN@ +endif LN_S = @LN_S@ MAKE = make diff --git src/clisp-link.in src/clisp-link.in index 5f1ddecbe..cc89bd95c 100644 --- src/clisp-link.in +++ src/clisp-link.in @@ -26,9 +26,14 @@ normalize(){ # dir rel -> abs path for rel lncp () { # Make a link from $1 to $2. Try symbolic link, hard link, file copying. rm -f "$2" - ln -s "`normalize . $1`" "$2" 2>/dev/null || \ - ln "$1" "$2" 2>/dev/null || \ - cp -p "$1" "$2" + case "$1" in + *.dll ) + cp -p "$1" "$2" ;; + * ) + ln -s "`normalize . $1`" "$2" 2>/dev/null || \ + ln "$1" "$2" 2>/dev/null || \ + cp -p "$1" "$2" ;; + esac } lncp_some () { -- 2.12.0