Archives/falk-werner_webfuse-provider
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse-provider synced 2024-09-28 06:10:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #61 from falk-werner/update_lws

Browse Source 
updated libwebsockets to 4.0.1
This commit is contained in:
Falk Werner 2020-04-06 20:27:29 +02:00 committed by GitHub
commit 74c1c44655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -62,11 +62,11 @@ FETCH_TARGETS += $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz
$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: URL := https://github.com/libfuse/libfuse/archive/fuse-$(FUSE_VERSION).tar.gz $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: URL := https://github.com/libfuse/libfuse/archive/fuse-$(FUSE_VERSION).tar.gz
$(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 5f7c1062def710d8b60343524a18cc82 $(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 5f7c1062def710d8b60343524a18cc82
WEBSOCKETS_VERSION ?= 3.2.0 WEBSOCKETS_VERSION ?= 4.0.1
DOCKER_BUILDARGS += WEBSOCKETS_VERSION=$(WEBSOCKETS_VERSION) DOCKER_BUILDARGS += WEBSOCKETS_VERSION=$(WEBSOCKETS_VERSION)
FETCH_TARGETS += $(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz FETCH_TARGETS += $(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz
$(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: URL := https://github.com/warmcat/libwebsockets/archive/v$(WEBSOCKETS_VERSION).tar.gz $(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: URL := https://github.com/warmcat/libwebsockets/archive/v$(WEBSOCKETS_VERSION).tar.gz
$(SKIP_MD5SUM)$(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: MD5 := 1d06f5602604e67e6f50cef9857c6b0c $(SKIP_MD5SUM)$(FETCHDIR)/libwebsockets-$(WEBSOCKETS_VERSION).tar.gz: MD5 := b5f90b470f398abbcf66e4639ad0273a
JANSSON_VERSION ?= 2.12 JANSSON_VERSION ?= 2.12
DOCKER_BUILDARGS += JANSSON_VERSION=$(JANSSON_VERSION) DOCKER_BUILDARGS += JANSSON_VERSION=$(JANSSON_VERSION)

7
build/amd64-alpine-builder.dockerfile
View File

@ -67,9 +67,11 @@ RUN set -x \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apk del .build-deps && apk del .build-deps
ARG WEBSOCKETS_VERSION=3.2.0 ARG WEBSOCKETS_VERSION=4.0.1
RUN set -x \ RUN set -x \
&& builddeps="linux-headers" \
&& apk add --no-cache --virtual .build-deps $builddeps \
&& apk add --no-cache \ && apk add --no-cache \
ca-certificates \ ca-certificates \
openssl \ openssl \
@ -79,7 +81,8 @@ RUN set -x \
&& cd "$builddir" \ && cd "$builddir" \
&& cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \ && cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \
&& make "$PARALLELMFLAGS" install \ && make "$PARALLELMFLAGS" install \
&& rm -rf "$builddir" && rm -rf "$builddir" \
&& apk del .build-deps
ARG JANSSON_VERSION=2.12 ARG JANSSON_VERSION=2.12

2
build/amd64-ubuntu-builder.dockerfile
View File

@ -65,7 +65,7 @@ RUN set -x \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apt purge -y $builddeps && apt purge -y $builddeps
ARG WEBSOCKETS_VERSION=3.2.0 ARG WEBSOCKETS_VERSION=4.0.1
RUN set -x \ RUN set -x \
&& apt install --yes --no-install-recommends \ && apt install --yes --no-install-recommends \

7
build/arm32v7-alpine-builder.dockerfile
View File

@ -71,9 +71,11 @@ RUN set -x \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apk del .build-deps && apk del .build-deps
ARG WEBSOCKETS_VERSION=3.2.0 ARG WEBSOCKETS_VERSION=4.0.1
RUN set -x \ RUN set -x \
&& builddeps="linux-headers" \
&& apk add --no-cache --virtual .build-deps $builddeps \
&& apk add --no-cache \ && apk add --no-cache \
ca-certificates \ ca-certificates \
openssl \ openssl \
@ -83,7 +85,8 @@ RUN set -x \
&& cd "$builddir" \ && cd "$builddir" \
&& cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \ && cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \
&& make "$PARALLELMFLAGS" install \ && make "$PARALLELMFLAGS" install \
&& rm -rf "$builddir" && rm -rf "$builddir" \
&& apk del .build-deps
ARG JANSSON_VERSION=2.12 ARG JANSSON_VERSION=2.12

2
build/arm32v7-ubuntu-builder.dockerfile
View File

@ -68,7 +68,7 @@ RUN set -x \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apt purge -y $builddeps && apt purge -y $builddeps
ARG WEBSOCKETS_VERSION=3.2.0 ARG WEBSOCKETS_VERSION=4.0.1
RUN set -x \ RUN set -x \
&& apt install --yes --no-install-recommends \ && apt install --yes --no-install-recommends \

6
doc/build.md
View File

@ -58,9 +58,9 @@ To install libfuse, meson is needed. Please refer to [meson quick guide](https:/
#### libwebsockets #### libwebsockets
wget -O libwebsockets-3.2.0.tar.gz https://github.com/warmcat/libwebsockets/archive/v3.2.0.tar.gz wget -O libwebsockets-4.0.1.tar.gz https://github.com/warmcat/libwebsockets/archive/v4.0.1.tar.gz
tar -xf libwebsockets-3.2.0.tar.gz tar -xf libwebsockets-4.0.1.tar.gz
cd libwebsockets-3.2.0 cd libwebsockets-4.0.1
mkdir .build mkdir .build
cd .build cd .build
cmake .. cmake ..