diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-10-09 10:23:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-10-09 10:23:44 +0000 |
| commit | e69bae37c621e77b7ac63e8bc09eef7ab639b95f (patch) | |
| tree | c21b01a9864d72ac57dc0fd3b68f3abb27757cda /scripts/cross-build.sh | |
| parent | Releasing debian version 1.6.3-4. (diff) | |
| download | ttyd-e69bae37c621e77b7ac63e8bc09eef7ab639b95f.tar.xz ttyd-e69bae37c621e77b7ac63e8bc09eef7ab639b95f.zip | |
Merging upstream version 1.6.3+20210924.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'scripts/cross-build.sh')
| -rwxr-xr-x | scripts/cross-build.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/cross-build.sh b/scripts/cross-build.sh index 848aef5..4070ca8 100755 --- a/scripts/cross-build.sh +++ b/scripts/cross-build.sh @@ -14,7 +14,7 @@ ZLIB_VERSION="${ZLIB_VERSION:-1.2.11}" JSON_C_VERSION="${JSON_C_VERSION:-0.15}" MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.16.8}" LIBUV_VERSION="${LIBUV_VERSION:-1.40.0}" -LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.1.6}" +LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.2.1}" build_zlib() { echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..." @@ -106,7 +106,6 @@ build_libwebsockets() { -DLWS_WITH_LEJP=OFF \ -DLWS_WITH_LEJP_CONF=OFF \ -DLWS_WITH_LWSAC=OFF \ - -DLWS_WITH_CUSTOM_HEADERS=OFF \ -DLWS_WITH_SEQUENCER=OFF \ .. make -j"$(nproc)" install @@ -154,15 +153,24 @@ build() { } case ${BUILD_TARGET} in - i686|x86_64|aarch64|mips|mipsel|mips64|mips64el) + amd64) BUILD_TARGET="x86_64" ;; + arm64) BUILD_TARGET="aarch64" ;; + armv7) BUILD_TARGET="armv7l" ;; +esac + +case ${BUILD_TARGET} in + i686|x86_64|aarch64|mips|mipsel|mips64|mips64el|s390x) build "${BUILD_TARGET}-linux-musl" "${BUILD_TARGET}" ;; arm) - build arm-linux-musleabi "${BUILD_TARGET}" + build "${BUILD_TARGET}-linux-musleabi" "${BUILD_TARGET}" ;; armhf) build arm-linux-musleabihf "${BUILD_TARGET}" ;; + armv7l) + build armv7l-linux-musleabihf "${BUILD_TARGET}" + ;; *) echo "unknown cross target: ${BUILD_TARGET}" && exit 1 esac |