Skip to content

Commit 39b650f

Browse files
pmp-ppmp-p
committed
3.1.61pre 3.13b1+xml2+geos, missing libmpdec and PROJ
1 parent 320536d commit 39b650f

File tree

4 files changed

+127
-4
lines changed

4 files changed

+127
-4
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
build:
1919
runs-on: ubuntu-22.04
2020
env:
21-
BUILDS: 3.12
21+
BUILDS: 3.12 3.13
2222

2323
steps:
2424
- uses: actions/checkout@v3.3.0

‎scripts/cpython-fetch.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PYPATCH=true
1818
[ -f $HPY ] || REBUILD=true
1919

2020

21-
if echo $PYBUILD |grep -q 13$
21+
if echo $PYBUILD |grep -q 14$
2222
then
2323
if [ -d cpython${PYBUILD} ]
2424
then
@@ -43,12 +43,19 @@ then
4343
fi
4444

4545

46+
if echo $PYBUILD |grep -q 13$
47+
then
48+
wget -q -c https://www.python.org/ftp/python/3.13.0/Python-3.13.0b1.tar.xz
49+
tar xf Python-3.13.0b1.tar.xz
50+
ln -s Python-3.13.0b1 cpython${PYBUILD}
51+
52+
fi
53+
4654
if echo $PYBUILD |grep -q 12$
4755
then
4856
wget -q -c https://www.python.org/ftp/python/3.12.3/Python-3.12.3.tar.xz
4957
tar xf Python-3.12.3.tar.xz
5058
ln -s Python-3.12.3 cpython${PYBUILD}
51-
export REBUILD=true
5259
fi
5360

5461

@@ -57,7 +64,6 @@ then
5764
wget -q -c https://www.python.org/ftp/python/3.11.9/Python-3.11.9.tar.xz
5865
tar xf Python-3.11.9.tar.xz
5966
ln -s Python-3.11.9 cpython${PYBUILD}
60-
export REBUILD=true
6167
fi
6268

6369
popd

‎sources.wasm/geos.sh‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#!/bin/bash
2+
3+
. ${CONFIG:-config}
4+
5+
6+
cd ${ROOT}/src
7+
8+
if [ -d libgeos ]
9+
then
10+
echo ok
11+
else
12+
wget -c https://download.osgeo.org/geos/geos-3.12.1.tar.bz2
13+
tar xfj geos-3.12.1.tar.bz2
14+
mv geos-3.12.1 libgeos
15+
pushd libgeos
16+
patch -p1 <<END
17+
--- geos-3.12.1/CMakeLists.txt 2023-11-11 23:39:58.000000000 +0100
18+
+++ libgeos/CMakeLists.txt 2024-05-30 15:05:39.552891249 +0200
19+
@@ -340,7 +340,8 @@
20+
endif()
21+
22+
add_subdirectory(capi)
23+
-
24+
+if (CMAKE_CROSSCOMPILING_EMULATOR)
25+
+else()
26+
#-----------------------------------------------------------------------------
27+
# Tests
28+
#-----------------------------------------------------------------------------
29+
@@ -381,6 +382,7 @@
30+
add_subdirectory(web)
31+
endif()
32+
33+
+endif() # EMSCRIPTEN/WASI
34+
#-----------------------------------------------------------------------------
35+
# Install and export targets - support 'make install' or equivalent
36+
#-----------------------------------------------------------------------------
37+
END
38+
popd
39+
40+
fi
41+
42+
if [ -f $PREFIX/lib/libgeos.a ]
43+
then
44+
echo "
45+
already built in $PREFIX/lib/libgeos.a
46+
"
47+
else
48+
. ${SDKROOT}/scripts/emsdk-fetch.sh
49+
50+
mkdir -p $ROOT/build/libgeos
51+
pushd $ROOT/build/libgeos
52+
emcmake cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX ${ROOT}/src/libgeos
53+
#emconfigure ${ROOT}/src/libgeos/configure --prefix=$PREFIX --disable-test
54+
emmake make -j $(nproc) install
55+
popd
56+
fi
57+
58+
59+

‎sources.wasm/libxml2.sh‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#!/bin/bash
2+
3+
. ${CONFIG:-config}
4+
5+
6+
cd ${ROOT}/src
7+
8+
if [ -d libxml2 ]
9+
then
10+
echo ok
11+
else
12+
wget -c https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz
13+
tar xf libxml2-2.12.7.tar.xz
14+
mv libxml2-2.12.7 libxml2
15+
fi
16+
17+
if [ -f $PREFIX/lib/libxml2.a ]
18+
then
19+
echo "
20+
already built in $PREFIX/lib/libxml2.a
21+
"
22+
else
23+
. ${SDKROOT}/scripts/emsdk-fetch.sh
24+
25+
mkdir -p $ROOT/build/libxml2
26+
pushd $ROOT/build/libxml2
27+
emconfigure ${ROOT}/src/libxml2/configure --prefix=$PREFIX \
28+
--with-http=no --with-ftp=no --with-python=no --with-threads=no \
29+
--enable-shared=no --enable-static=yes
30+
31+
# --enable-shared=yes => link error of
32+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlMemSetup
33+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlCheckVersion
34+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlSetCompressMode
35+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlAddEncodingAlias
36+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlNoNetExternalEntityLoader
37+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlSetExternalEntityLoader
38+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlLoadCatalogs
39+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlRegisterNodeDefault
40+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlDeregisterNodeDefault
41+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlTreeIndentString
42+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlGetExternalEntityLoader
43+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlSetExternalEntityLoader
44+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlGenericErrorContext
45+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlGenericError
46+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlSchematronNewParserCtxt
47+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlSchematronParse
48+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlGenericErrorContext
49+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlGenericError
50+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlSchematronFreeParserCtxt
51+
#wasm-ld: error: xmllint-xmllint.o: undefined symbol: xmlRelaxNGNewParserCtxt
52+
53+
emmake make install
54+
popd
55+
fi
56+
57+
58+

0 commit comments

Comments
 (0)