Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PKG Configure zlib, not patch (#849) 

The #include <unistd.h> line is added in zconf.h, which is generated by
configure.
This commit is contained in:
Dexter Chua 2020-12-12 19:33:33 +08:00 committed by GitHub
parent dd616b5265
commit e8cc4e8835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpython/Makefile
View File

@ -72,10 +72,10 @@ $(BUILD)/.patched: $(TARBALL)
touch $@
$(ZLIBBUILD)/.patched: $(ZLIBTARBALL)
$(ZLIBBUILD)/.configured: $(ZLIBTARBALL)
[ -d $(ROOT)/build ] || (mkdir $(ROOT)/build)
tar -C $(ROOT)/build/ -xf $(ROOT)/downloads/zlib-1.2.11.tar.gz
cat patches/zlib/*.patch | (cd $(ZLIBBUILD) ; patch -p1)
cd $(ZLIBBUILD); emconfigure ./configure
touch $@
@ -98,7 +98,7 @@ $(BZIP2BUILD)/libbz2.a: $(BZIP2TARBALL)
)
$(BUILD)/Makefile: $(BUILD)/.patched $(ZLIBBUILD)/.patched $(SQLITEBUILD)/libsqlite3.la $(BZIP2BUILD)/libbz2.a
$(BUILD)/Makefile: $(BUILD)/.patched $(ZLIBBUILD)/.configured $(SQLITEBUILD)/libsqlite3.la $(BZIP2BUILD)/libbz2.a
cp config.site $(BUILD)/
( \
cd $(BUILD); \

12
cpython/patches/zlib/include_unistd.patch
View File

@ -1,12 +0,0 @@
diff -u zlib-1.2.11-orig/gzguts.h zlib-1.2.11/gzguts.h
--- a/gzguts.h
+++ b/gzguts.h
@@ -3,6 +3,8 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
+#include <unistd.h>
+
#ifdef _LARGEFILE64_SOURCE
# ifndef _LARGEFILE_SOURCE
# define _LARGEFILE_SOURCE 1