Some other pyodide changes

component/pyodide/buildout.cfg

@@ -52,7 +52,7 @@ environment =
 [pyodide-src]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
-repository = https://github.com/iodide-project/pyodide.git
+repository = https://lab.nexedi.com/Daetalus/pyodide.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 branch = master
 
@@ -84,14 +84,14 @@ make-targets =
 [pyodide-cpython]
 recipe = slapos.recipe.cmmi
 path = ${pyodide-src:location}/cpython
-configure-command = sed -ie "s@./configure --prefix@./configure --with-openssl=${openssl:location} --prefix@" ${pyodide-src:location}/cpython/Makefile
+configure-command = sed -ie "s@./configure --prefix@./configure --with-openssl=${openssl:location} --prefix@" ${pyodide-src:location}/cpython/Makefile && source ${pyodide-emsdk:path}/emsdk/emsdk_env.sh
 make-options = -e
 environment =
-  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:$PKG_CONFIG_PATH
-  PATH=${pkgconfig:location}/bin:${f2c:location}/bin:${python3.7.2:location}/bin:${cmake:location}/bin:${ccache:location}/bin:${gcc:location}/bin:%(PATH)s
+  PATH=${xz-utils:location}/bin:${gcc:location}/bin:%(PATH)s
+  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
   CC=${gcc:location}/bin/gcc
   CXX=${gcc:location}/bin/g++
-  LD_LIBRARY_PATH=${libpng:location}/lib:${gcc:location}/lib:${gcc:location}/lib64
 make-targets =
 
 [pyodide-packages]