Skip to content

Commit

Permalink
Restore missing file that configure.ac wants. Tested on linux non-emb…
Browse files Browse the repository at this point in the history
…edded. [appveyor skip]
  • Loading branch information
jamadden committed Apr 15, 2019
1 parent 4763354 commit b1ca426
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion deps/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ Updating libuv
cd deps/
wget https://dist.libuv.org/dist/$LIBUV_VER/libuv-$LIBUV_VER.tar.gz
tar -xf libuv-$LIBUV_VER.tar.gz
rm libuv-$LIBUV_VER.tar.gz
rm -rf libuv
mv libuv-$LIBUV_VER libuv
rm -rf libuv/.github
rm -rf libuv/docs
rm -rf libuv/samples
rm -rf libuv/test
rm -rf libuv/test/*.[ch] libuv/test/test.gyp # must leave the fixtures/ dir
rm -rf libuv/tools
rm -f libuv/android-configure*
git apply libuv-win-binary.patch
Expand Down
4 changes: 2 additions & 2 deletions deps/libuv-win-binary.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ diff --git a/deps/libuv/src/win/fs.c b/deps/libuv/src/win/fs.c
index 812c1a6d..f4d66628 100644
--- a/deps/libuv/src/win/fs.c
+++ b/deps/libuv/src/win/fs.c
@@ -135,7 +135,14 @@ const WCHAR UNC_PATH_PREFIX_LEN = 8;
@@ -135,5 +135,12 @@ const WCHAR UNC_PATH_PREFIX_LEN = 8;
static int uv__file_symlink_usermode_flag = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;

void uv_fs_init(void) {
- _fmode = _O_BINARY;
+/* gevent: This breaks `open()` on CPython 2 by changing
+ * the default mode for file operations. Python 3 and PyPy
+ * are unaffected. It was removed for the (unreleased) libuv 2.
+ * ar unaffected. It was removed for the (unreleased) libuv 2.
+ * See https://github.com/gevent/gevent/issues/1282
+ */
+/*
Expand Down
Empty file.
1 change: 1 addition & 0 deletions deps/libuv/test/fixtures/load_error.node
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foobar

0 comments on commit b1ca426

Please sign in to comment.