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

Fix build error for zlib (#1060)

This commit is contained in:
Michael Greminger 2021-01-06 20:48:04 -06:00 committed by GitHub
parent a58c8d7186
commit ec527fee02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/zlib/meta.yaml
View File

@ -9,5 +9,5 @@ source:
build:
library: true
script: |
CFLAGS="-fPIC" emconfigure ./configure --prefix=`cwd`
CFLAGS="-fPIC" emconfigure ./configure --prefix=$PWD
emmake make install -j ${PYODIDE_JOBS:-3}

4
pyodide_build/buildpkg.py
View File

@ -173,7 +173,7 @@ def compile(path: Path, srcpath: Path, pkg: Dict[str, Any], args):
site_packages_dir = srcpath / "install" / "lib" / "python3.8" / "site-packages"
pkgdir = path.parent.resolve()
env = {"SITEPACKAGES": str(site_packages_dir), "PKGDIR": str(pkgdir)}
subprocess.run(["bash", "-c", post], env=env, check=True)
subprocess.run(["bash", "-ce", post], env=env, check=True)
with open(srcpath / ".built", "wb") as fd:
fd.write(b"\n")
@ -222,7 +222,7 @@ def run_script(buildpath: Path, srcpath: Path, pkg: Dict[str, Any]):
orig_path = Path.cwd()
os.chdir(srcpath)
try:
subprocess.run(["bash", "-c", pkg["build"]["script"]], check=True)
subprocess.run(["bash", "-ce", pkg["build"]["script"]], check=True)
finally:
os.chdir(orig_path)