Skip to content

Commit 36daddd

Browse files
committed
3.1.57.1bi
1 parent e1d8c94 commit 36daddd

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ mkdir -p ${SDKROOT}/build/pycache ${SDKROOT}/build/cache
2121
export XDG_CACHE_HOME=$(realpath ${SDKROOT}/build/cache)
2222
export PYTHONPYCACHEPREFIX=${PYTHONPYCACHEPREFIX:-$(realpath ${SDKROOT}/build/pycache)}
2323

24+
export WHEELS=/data/git/archives/repo
2425

2526
export HOME=${SDKROOT}
2627

scripts/cpython-build-emsdk.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,10 @@ else
6565
#TODO: check if export PATH=${HOST_PREFIX}/bin:$PATH is really set to avoid system python with different bytecode
6666
#and no loder lib-dynload in the way.
6767

68-
if echo $PYBUILD|grep 13$
69-
then
70-
GIL="--disable-gil"
71-
else
72-
GIL=""
73-
fi
7468

7569

7670
EMCC_CFLAGS="-O0 -g0 -fPIC" CFLAGS="-O0 -g0 -fPIC" CC=${SDKROOT}/emsdk/upstream/emscripten/emcc \
7771
emconfigure $ROOT/src/libffi/configure --host=wasm32-bi-emscripten \
78-
$GIL \
7972
--prefix=$PREFIX --enable-static --disable-shared --disable-dependency-tracking\
8073
--disable-builddir --disable-multi-os-directory --disable-raw-api --disable-docs
8174

@@ -203,11 +196,22 @@ END
203196
# please let compiler/user decide what to do with wasm CPU.
204197
sed -i 's|-sWASM_BIGINT||g' configure
205198
sed -i 's|-sWASM_BIGINT||g' configure.ac
199+
200+
# do not mess with wasm sysconfig name
201+
if echo $PYBUILD|grep -q 13$
202+
then
203+
GIL="--disable-gil"
204+
sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure
205+
sed -i 's|{ABIFLAGS}t|{ABIFLAGS}|g' configure.ac
206+
else
207+
GIL=""
208+
fi
209+
206210
popd
207211

208212

209213
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" CONFIG_SITE=$ROOT/src/cpython${PYBUILD}/Tools/wasm/config.site-wasm32-pydk \
210-
emconfigure $ROOT/src/cpython${PYBUILD}/configure -C --with-emscripten-target=browser \
214+
emconfigure $ROOT/src/cpython${PYBUILD}/configure -C --with-emscripten-target=browser $GIL \
211215
--cache-file=${PYTHONPYCACHEPREFIX}/config.cache \
212216
--enable-wasm-dynamic-linking $TESTSUITE\
213217
--host=$PYDK_PYTHON_HOST_PLATFORM \

0 commit comments

Comments
 (0)