Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
update ECL to 16.1.3 - most of our patches are obsolete
Browse files Browse the repository at this point in the history
  • Loading branch information
dimpase committed Jan 16, 2017
1 parent 14216c6 commit eff6081
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 111 deletions.
8 changes: 4 additions & 4 deletions build/pkgs/ecl/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=ecl-VERSION.tar.bz2
sha1=66f99db852b23660668e8c1d5304ec842558d1a2
md5=14740f65bb971127bb10caaff855361e
cksum=1956945543
tarball=ecl-VERSION.tgz
sha1=a0db6c435dcc33404b0a2a4a402e1f2edc169e95
md5=204e20f3fa875f1dfab96bfee07ecf60
cksum=2022632711
2 changes: 1 addition & 1 deletion build/pkgs/ecl/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.1.2.p2
16.1.3.p0
14 changes: 0 additions & 14 deletions build/pkgs/ecl/patches/16.1.2-getcwd.patch

This file was deleted.

28 changes: 0 additions & 28 deletions build/pkgs/ecl/patches/cygwin-uname.patch

This file was deleted.

29 changes: 0 additions & 29 deletions build/pkgs/ecl/patches/fix-cc.patch

This file was deleted.

21 changes: 0 additions & 21 deletions build/pkgs/ecl/patches/windows-fixes.patch

This file was deleted.

27 changes: 13 additions & 14 deletions build/pkgs/ecl/patches/write_error.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
diff -Naur ecl-16.1.2.orig/src/c/file.d ecl-16.1.2/src/c/file.d
--- ecl-16.1.2.orig/src/c/file.d 2016-05-11 13:10:51.867673867 +1200
+++ ecl-16.1.2/src/c/file.d 2016-05-11 14:44:48.121907307 +1200
@@ -3354,8 +3354,10 @@
ecl_disable_interrupts();
do {
out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm));
- } while (out < n && restartable_io_error(strm, "fwrite"));
- ecl_enable_interrupts();
+ /* Ignore write errors to stderr to avoid an infinite loop */
+ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite"));
diff --git a/src/c/file.d b/src/c/file.d
index 0f739b0..70e5c77 100755
--- a/src/c/file.d
+++ b/src/c/file.d
@@ -3351,7 +3351,9 @@ output_stream_write_byte8(cl_object strm, unsigned char *c, cl_index n)
ecl_disable_interrupts();
do {
out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm));
- } while (out < n && restartable_io_error(strm, "fwrite"));
+ /* Ignore write errors to stderr to avoid an infinite loop */
+ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite"));
+
+ ecl_enable_interrupts();
return out;
ecl_enable_interrupts();
return out;
}

0 comments on commit eff6081

Please sign in to comment.