Skip to content

Commit 2993864

Browse files
assambarassambar
authored
Merge pull request #110 from vmware-labs/latest-versions
Bump to latest versions (along with the wasi-sdk-20 builds)
2 parents b99289e + d1d83f1 commit 2993864

File tree

69 files changed

+5529
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+5529
-184
lines changed

‎.github/workflows/build-php.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ jobs:
3838
flavor: -slim
3939
build-php-cli: false
4040
version: 8.2.0
41+
- name: php-
42+
suffix: ""
43+
flavor: ""
44+
build-php-cli: false
45+
version: 8.2.6
46+
- name: wasmedge-php-
47+
suffix: "-wasmedge"
48+
flavor: ""
49+
build-php-cli: false
50+
version: 8.2.6
4151
runs-on: ubuntu-latest
4252
steps:
4353
- name: Checkout repository

‎.github/workflows/build-python.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
include:
1616
- prefix: ""
1717
suffix: ""
18-
version: "3.11.3"
18+
version: "3.11.4"
1919
- prefix: "wasmedge-"
2020
suffix: "-wasmedge"
21-
version: "3.11.3"
21+
version: "3.11.4"
2222
- prefix: "aio-"
2323
suffix: "-aio"
24-
version: "3.11.3"
24+
version: "3.11.4"
2525
- prefix: "aio-wasmedge-"
2626
suffix: "-aio-wasmedge"
27-
version: "3.11.3"
27+
version: "3.11.4"
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout repository

‎.github/workflows/build-ruby.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ jobs:
1616
include:
1717
- version: 3.2.0
1818
target_version: 3_2_0
19+
- version: 3.2.2
20+
target_version: 3_2_2
21+
exclude:
22+
- flavor: "-slim"
23+
version: 3.2.2
1924
runs-on: ubuntu-latest
2025
steps:
2126
- name: Checkout repository

‎.github/workflows/release-php.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@ jobs:
3939
flavor: -slim
4040
build-php-cli: false
4141
version: 8.2.0
42+
- name: php-
43+
suffix: ""
44+
flavor: ""
45+
build-php-cli: false
46+
version: 8.2.6
47+
- name: wasmedge-php-
48+
suffix: "-wasmedge"
49+
flavor: ""
50+
build-php-cli: true
51+
version: 8.2.6
4252
runs-on: ubuntu-latest
4353
steps:
4454
- name: Checkout repository

‎.github/workflows/release-ruby.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ jobs:
1717
include:
1818
- version: 3.2.0
1919
target_version: 3_2_0
20+
- version: 3.2.2
21+
target_version: 3_2_2
22+
exclude:
23+
- flavor: "-slim"
24+
version: 3.2.2
2025
runs-on: ubuntu-latest
2126
steps:
2227
- name: Checkout repository

‎Dockerfile.wasi-builder

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN apt update && \
2828
clang \
2929
curl \
3030
git \
31+
jq \
3132
libtool \
3233
libtool-bin \
3334
pkg-config \

‎Makefile

+19-14
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ php/wasmedge-php-8.2.0:
1111
WLR_BUILD_FLAVOR=wasmedge \
1212
make -C php php-8.2.0
1313

14+
.PHONY: php/wasmedge-php-8.2.6
15+
php/wasmedge-php-8.2.6:
16+
WLR_BUILD_FLAVOR=wasmedge \
17+
make -C php php-8.2.6
18+
1419
.PHONY: php/master
1520
php/master:
1621
make -C php master
@@ -62,42 +67,42 @@ oci-python-3.11.1-wasmedge: python/wasmedge-v3.11.1
6267
-f images/python/Dockerfile \
6368
build-output
6469

65-
.PHONY: python/wasmedge-v3.11.3
66-
python/wasmedge-v3.11.3:
70+
.PHONY: python/wasmedge-v3.11.4
71+
python/wasmedge-v3.11.4:
6772
WLR_BUILD_FLAVOR=wasmedge \
6873
make -C python $(subst python/wasmedge-,,$@)
6974

70-
.PHONY: python/aio-v3.11.3
71-
python/aio-v3.11.3:
75+
.PHONY: python/aio-v3.11.4
76+
python/aio-v3.11.4:
7277
WLR_BUILD_FLAVOR=aio \
7378
make -C python $(subst python/aio-,,$@)
7479

75-
.PHONY: python/aio-wasmedge-v3.11.3
76-
python/aio-wasmedge-v3.11.3:
80+
.PHONY: python/aio-wasmedge-v3.11.4
81+
python/aio-wasmedge-v3.11.4:
7782
WLR_BUILD_FLAVOR=aio-wasmedge \
7883
make -C python $(subst python/aio-wasmedge-,,$@)
7984

80-
.PHONY: oci-python-3.11.3
81-
oci-python-3.11.3: python/v3.11.3
85+
.PHONY: oci-python-3.11.4
86+
oci-python-3.11.4: python/v3.11.4
8287
docker build \
8388
--platform wasi/wasm32 \
8489
--build-arg NAME=python-wasm \
8590
--build-arg SUMMARY="CPython built for WASI, by Wasm Labs" \
86-
--build-arg ARTIFACTS_BASE_DIR=python/v3.11.3 \
91+
--build-arg ARTIFACTS_BASE_DIR=python/v3.11.4 \
8792
--build-arg PYTHON_BINARY=python.wasm \
88-
-t ghcr.io/vmware-labs/python-wasm:3.11.3 \
93+
-t ghcr.io/vmware-labs/python-wasm:3.11.4 \
8994
-f images/python/Dockerfile \
9095
build-output
9196

92-
.PHONY: oci-python-3.11.3-wasmedge
93-
oci-python-3.11.3-wasmedge: python/wasmedge-v3.11.3
97+
.PHONY: oci-python-3.11.4-wasmedge
98+
oci-python-3.11.3-wasmedge: python/wasmedge-v3.11.4
9499
docker build \
95100
--platform wasi/wasm32 \
96101
--build-arg NAME=python-wasm \
97102
--build-arg SUMMARY="CPython built for WASI+WasmEdge, by Wasm Labs" \
98-
--build-arg ARTIFACTS_BASE_DIR=python/v3.11.3-wasmedge \
103+
--build-arg ARTIFACTS_BASE_DIR=python/v3.11.4-wasmedge \
99104
--build-arg PYTHON_BINARY=python.wasm \
100-
-t ghcr.io/vmware-labs/python-wasm:3.11.3-wasmedge \
105+
-t ghcr.io/vmware-labs/python-wasm:3.11.4-wasmedge \
101106
-f images/python/Dockerfile \
102107
build-output
103108

‎libs/bundle_wlr/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
This folder builds assets of the bundle_wlr project.
44

5-
The list of bundled libraries can be deduced from [wlr-build-deps.sh](./wlr-build-deps.sh) in main project page is at [https://www.zlib.net/](https://www.zlib.net/).
5+
The list of bundled libraries can be deduced from the `"deps"` section in [wlr-info.json](./wlr-info.sh). The main project page is at [https://www.zlib.net/](https://www.zlib.net/).

‎libs/bundle_wlr/wlr-build-deps.sh

-32
This file was deleted.

‎libs/bundle_wlr/wlr-info.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"deps": {
3+
"zlib": {
4+
"build_target": "libs/zlib/v1.2.13",
5+
"required_file": "lib/wasm32-wasi/libz.a"
6+
},
7+
"libpng": {
8+
"build_target": "libs/libpng/v1.6.39",
9+
"required_file": "lib/wasm32-wasi/libpng16.a"
10+
},
11+
"libjpeg": {
12+
"build_target": "libs/libjpeg/v2.1.5.1",
13+
"required_file": "lib/wasm32-wasi/libjpeg.a"
14+
},
15+
"libxml2": {
16+
"build_target": "libs/libxml2/v2.11.4",
17+
"required_file": "lib/wasm32-wasi/libxml2.a"
18+
},
19+
"oniguruma": {
20+
"build_target": "libs/oniguruma/v6.9.8",
21+
"required_file": "lib/wasm32-wasi/libonig.a"
22+
},
23+
"SQLite": {
24+
"build_target": "libs/sqlite/v3.42.0",
25+
"required_file": "lib/wasm32-wasi/libsqlite3.a"
26+
},
27+
"libuuid": {
28+
"build_target": "libs/libuuid/v1.0.3",
29+
"required_file": "lib/wasm32-wasi/libuuid.a"
30+
},
31+
"bzip2": {
32+
"build_target": "libs/bzip2/v1.0.8",
33+
"required_file": "lib/wasm32-wasi/libbz2.a"
34+
}
35+
}
36+
}

‎libs/libpng/v1.6.39/wlr-build-deps.sh

-12
This file was deleted.

‎libs/libpng/v1.6.39/wlr-info.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"deps": {
3+
"zlib": {
4+
"build_target": "libs/zlib/v1.2.13",
5+
"required_file": "lib/wasm32-wasi/libz.a"
6+
}
7+
}
8+
}

‎libs/libuuid/v1.0.3/wlr-env-repo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ fi
1212

1313
export WLR_REPO=https://git.code.sf.net/p/libuuid/code
1414
export WLR_REPO_BRANCH=libuuid-1.0.3
15-
export WLR_ENV_NAME=uuid/libuuid-1.0.3
15+
export WLR_ENV_NAME=libuuid/libuuid-1.0.3
1616
export WLR_PACKAGE_VERSION=1.0.3
1717
export WLR_PACKAGE_NAME=uuid

‎libs/libxml2/v2.11.4/wlr-build.sh

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ ! -v WLR_ENV ]]
4+
then
5+
echo "Wasmlabs environment is not set"
6+
exit 1
7+
fi
8+
9+
export CFLAGS_CONFIG="-O0"
10+
11+
export CFLAGS_WASI="--sysroot=${WASI_SYSROOT}"
12+
export LDFLAGS_WASI="--sysroot=${WASI_SYSROOT}"
13+
14+
export CFLAGS_LIBXML2=''
15+
16+
logStatus "Using LIBXML2 DEFINES: ${CFLAGS_LIBXML2}"
17+
18+
export CFLAGS_BUILD=''
19+
20+
# We need to add LDFLAGS ot CFLAGS because autoconf compiles(+links) to binary when checking stuff
21+
export CFLAGS="${CFLAGS_CONFIG} ${CFLAGS_WASI} ${CFLAGS_LIBXML2} ${CFLAGS_BUILD} ${LDFLAGS_WASI}"
22+
export LDFLAGS="${LDFLAGS_WASI}"
23+
24+
cd "${WLR_SOURCE_PATH}"
25+
26+
source ${WLR_REPO_ROOT}/scripts/build-helpers/wlr_pkg_config.sh
27+
28+
if [[ -z "$WLR_SKIP_CONFIGURE" ]]; then
29+
./autogen.sh
30+
export LIBXML2_CONFIGURE="${WLR_CONFIGURE_PREFIXES} --enable-static --disable-shared --with-minimum=yes --with-output=yes --with-schemas=yes --with-tree=yes --with-valid=yes --with-html=yes --with-xpath=yes --with-reader=yes --with-writer=yes --with-xinclude=yes --with-c14n=yes --with-sax1=yes"
31+
logStatus "Configuring build with '${LIBXML2_CONFIGURE}'..."
32+
./configure --config-cache --host=wasm32-wasi host_alias=wasm32-musl-wasi --target=wasm32-wasi target_alias=wasm32-musl-wasi ${LIBXML2_CONFIGURE} || exit 1
33+
else
34+
logStatus "Skipping configure..."
35+
fi
36+
37+
logStatus "Building..."
38+
make -j || exit 1
39+
40+
logStatus "Preparing artifacts..."
41+
make install ${WLR_INSTALL_PREFIXES} || exit 1
42+
43+
wlr_package_lib
44+
45+
logStatus "DONE. Artifacts in ${WLR_OUTPUT}"

‎libs/libxml2/v2.11.4/wlr-env-repo.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ $1 == "--unset" ]]; then
4+
unset WLR_REPO
5+
unset WLR_REPO_BRANCH
6+
unset WLR_ENV_NAME
7+
unset WLR_PACKAGE_VERSION
8+
unset WLR_PACKAGE_NAME
9+
return
10+
fi
11+
12+
export WLR_REPO=https://github.com/GNOME/libxml2.git
13+
export WLR_REPO_BRANCH=v2.11.4
14+
export WLR_ENV_NAME=libxml2/v2.11.4
15+
export WLR_PACKAGE_VERSION=2.11.4
16+
export WLR_PACKAGE_NAME=xml2

‎libs/libxml2/v2.11.4/wlr-tag.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export WLR_TAG="libs/libxml2/2.11.4"

‎libs/sqlite/v3.42.0/patches/0001-Allow-installation-of-headers-and-pkg-config-files-w.patch

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 50027d770993b4bf5875e6cebf608151062765a9 Mon Sep 17 00:00:00 2001
2+
From: "[email protected]" <Wasm Labs Team>
3+
Date: Mon, 19 Jun 2023 14:58:12 +0300
4+
Subject: [PATCH] Allow installation of headers and pkg-config files with the
5+
library
6+
7+
8+
diff --git a/Makefile.in b/Makefile.in
9+
index 61cb3ef..68b0252 100644
10+
--- a/Makefile.in
11+
+++ b/Makefile.in
12+
@@ -1471,19 +1471,19 @@ threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
13+
14+
# Standard install and cleanup targets
15+
#
16+
-lib_install: libsqlite3.la
17+
+lib_install: libsqlite3.la sqlite3.h sqlite3.pc
18+
$(INSTALL) -d $(DESTDIR)$(libdir)
19+
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
20+
-
21+
-install: sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
22+
- $(INSTALL) -d $(DESTDIR)$(bindir)
23+
- $(LTINSTALL) sqlite3$(TEXE) $(DESTDIR)$(bindir)
24+
$(INSTALL) -d $(DESTDIR)$(includedir)
25+
$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
26+
$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
27+
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
28+
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
29+
30+
+install: sqlite3$(TEXE) lib_install ${HAVE_TCL:1=tcl_install}
31+
+ $(INSTALL) -d $(DESTDIR)$(bindir)
32+
+ $(LTINSTALL) sqlite3$(TEXE) $(DESTDIR)$(bindir)
33+
+
34+
pkgIndex.tcl:
35+
echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
36+
tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
37+
--
38+
2.38.1
39+

0 commit comments

Comments
 (0)