-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #110 from vmware-labs/latest-versions
Bump to latest versions (along with the wasi-sdk-20 builds)
- Loading branch information
Showing
69 changed files
with
5,529 additions
and
184 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ RUN apt update && \ | |
| clang \ | ||
| curl \ | ||
| git \ | ||
| jq \ | ||
| libtool \ | ||
| libtool-bin \ | ||
| pkg-config \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "deps": { | ||
| "zlib": { | ||
| "build_target": "libs/zlib/v1.2.13", | ||
| "required_file": "lib/wasm32-wasi/libz.a" | ||
| }, | ||
| "libpng": { | ||
| "build_target": "libs/libpng/v1.6.39", | ||
| "required_file": "lib/wasm32-wasi/libpng16.a" | ||
| }, | ||
| "libjpeg": { | ||
| "build_target": "libs/libjpeg/v2.1.5.1", | ||
| "required_file": "lib/wasm32-wasi/libjpeg.a" | ||
| }, | ||
| "libxml2": { | ||
| "build_target": "libs/libxml2/v2.11.4", | ||
| "required_file": "lib/wasm32-wasi/libxml2.a" | ||
| }, | ||
| "oniguruma": { | ||
| "build_target": "libs/oniguruma/v6.9.8", | ||
| "required_file": "lib/wasm32-wasi/libonig.a" | ||
| }, | ||
| "SQLite": { | ||
| "build_target": "libs/sqlite/v3.42.0", | ||
| "required_file": "lib/wasm32-wasi/libsqlite3.a" | ||
| }, | ||
| "libuuid": { | ||
| "build_target": "libs/libuuid/v1.0.3", | ||
| "required_file": "lib/wasm32-wasi/libuuid.a" | ||
| }, | ||
| "bzip2": { | ||
| "build_target": "libs/bzip2/v1.0.8", | ||
| "required_file": "lib/wasm32-wasi/libbz2.a" | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "deps": { | ||
| "zlib": { | ||
| "build_target": "libs/zlib/v1.2.13", | ||
| "required_file": "lib/wasm32-wasi/libz.a" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ ! -v WLR_ENV ]] | ||
| then | ||
| echo "Wasmlabs environment is not set" | ||
| exit 1 | ||
| fi | ||
|
|
||
| export CFLAGS_CONFIG="-O0" | ||
|
|
||
| export CFLAGS_WASI="--sysroot=${WASI_SYSROOT}" | ||
| export LDFLAGS_WASI="--sysroot=${WASI_SYSROOT}" | ||
|
|
||
| export CFLAGS_LIBXML2='' | ||
|
|
||
| logStatus "Using LIBXML2 DEFINES: ${CFLAGS_LIBXML2}" | ||
|
|
||
| export CFLAGS_BUILD='' | ||
|
|
||
| # We need to add LDFLAGS ot CFLAGS because autoconf compiles(+links) to binary when checking stuff | ||
| export CFLAGS="${CFLAGS_CONFIG} ${CFLAGS_WASI} ${CFLAGS_LIBXML2} ${CFLAGS_BUILD} ${LDFLAGS_WASI}" | ||
| export LDFLAGS="${LDFLAGS_WASI}" | ||
|
|
||
| cd "${WLR_SOURCE_PATH}" | ||
|
|
||
| source ${WLR_REPO_ROOT}/scripts/build-helpers/wlr_pkg_config.sh | ||
|
|
||
| if [[ -z "$WLR_SKIP_CONFIGURE" ]]; then | ||
| ./autogen.sh | ||
| 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" | ||
| logStatus "Configuring build with '${LIBXML2_CONFIGURE}'..." | ||
| ./configure --config-cache --host=wasm32-wasi host_alias=wasm32-musl-wasi --target=wasm32-wasi target_alias=wasm32-musl-wasi ${LIBXML2_CONFIGURE} || exit 1 | ||
| else | ||
| logStatus "Skipping configure..." | ||
| fi | ||
|
|
||
| logStatus "Building..." | ||
| make -j || exit 1 | ||
|
|
||
| logStatus "Preparing artifacts..." | ||
| make install ${WLR_INSTALL_PREFIXES} || exit 1 | ||
|
|
||
| wlr_package_lib | ||
|
|
||
| logStatus "DONE. Artifacts in ${WLR_OUTPUT}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ $1 == "--unset" ]]; then | ||
| unset WLR_REPO | ||
| unset WLR_REPO_BRANCH | ||
| unset WLR_ENV_NAME | ||
| unset WLR_PACKAGE_VERSION | ||
| unset WLR_PACKAGE_NAME | ||
| return | ||
| fi | ||
|
|
||
| export WLR_REPO=https://github.com/GNOME/libxml2.git | ||
| export WLR_REPO_BRANCH=v2.11.4 | ||
| export WLR_ENV_NAME=libxml2/v2.11.4 | ||
| export WLR_PACKAGE_VERSION=2.11.4 | ||
| export WLR_PACKAGE_NAME=xml2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export WLR_TAG="libs/libxml2/2.11.4" |
39 changes: 39 additions & 0 deletions
39
libs/sqlite/v3.42.0/patches/0001-Allow-installation-of-headers-and-pkg-config-files-w.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| From 50027d770993b4bf5875e6cebf608151062765a9 Mon Sep 17 00:00:00 2001 | ||
| From: "[email protected]" <Wasm Labs Team> | ||
| Date: Mon, 19 Jun 2023 14:58:12 +0300 | ||
| Subject: [PATCH] Allow installation of headers and pkg-config files with the | ||
| library | ||
|
|
||
|
|
||
| diff --git a/Makefile.in b/Makefile.in | ||
| index 61cb3ef..68b0252 100644 | ||
| --- a/Makefile.in | ||
| +++ b/Makefile.in | ||
| @@ -1471,19 +1471,19 @@ threadtest5: sqlite3.c $(TOP)/test/threadtest5.c | ||
|
|
||
| # Standard install and cleanup targets | ||
| # | ||
| -lib_install: libsqlite3.la | ||
| +lib_install: libsqlite3.la sqlite3.h sqlite3.pc | ||
| $(INSTALL) -d $(DESTDIR)$(libdir) | ||
| $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir) | ||
| - | ||
| -install: sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install} | ||
| - $(INSTALL) -d $(DESTDIR)$(bindir) | ||
| - $(LTINSTALL) sqlite3$(TEXE) $(DESTDIR)$(bindir) | ||
| $(INSTALL) -d $(DESTDIR)$(includedir) | ||
| $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir) | ||
| $(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir) | ||
| $(INSTALL) -d $(DESTDIR)$(pkgconfigdir) | ||
| $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir) | ||
|
|
||
| +install: sqlite3$(TEXE) lib_install ${HAVE_TCL:1=tcl_install} | ||
| + $(INSTALL) -d $(DESTDIR)$(bindir) | ||
| + $(LTINSTALL) sqlite3$(TEXE) $(DESTDIR)$(bindir) | ||
| + | ||
| pkgIndex.tcl: | ||
| echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@ | ||
| tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl | ||
| -- | ||
| 2.38.1 | ||
|
|
Oops, something went wrong.