Browse Source

Lwan: Update to the newest version (#6304)

* Lwan: Disable building with AutoFDO profile

* Lwan: Use Ubuntu 20.10 for its container

* Lwan: Build with a newer Lwan
Leandro A. F. Pereira 4 years ago
parent
commit
6d43ad15d7

+ 1 - 2
frameworks/C/lwan/Makefile

@@ -6,8 +6,7 @@ CFLAGS = -mtune=native -march=native -O3 -fno-plt -flto -ffat-lto-objects -DNDEB
 	-I /lwan/src/lib \
 	-I /lwan/src/lib \
 	`pkg-config mariadb --cflags` \
 	`pkg-config mariadb --cflags` \
 	`pkg-config sqlite3 --cflags` \
 	`pkg-config sqlite3 --cflags` \
-	`pkg-config luajit --cflags` \
-	-fauto-profile=/lwan/src/gcda/techempower.gcov
+	`pkg-config luajit --cflags`
 
 
 LDFLAGS = -mtune=native -march=native -O3 -flto -ffat-lto-objects -Wl,-z,now,-z,relro \
 LDFLAGS = -mtune=native -march=native -O3 -flto -ffat-lto-objects -Wl,-z,now,-z,relro \
 	-Wl,-whole-archive /lwan/build/src/lib/liblwan.a -Wl,-no-whole-archive \
 	-Wl,-whole-archive /lwan/build/src/lib/liblwan.a -Wl,-no-whole-archive \

+ 2 - 2
frameworks/C/lwan/lwan-lua.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:19.10
+FROM ubuntu:20.10
 
 
 RUN apt-get update -yqq && \
 RUN apt-get update -yqq && \
 	apt-get install -yqq \
 	apt-get install -yqq \
@@ -18,7 +18,7 @@ RUN mkdir luajit && \
     cd luajit && \
     cd luajit && \
     PREFIX=/usr CFLAGS="-O3 -mtune=native -march=native -flto -ffat-lto-objects" make -j install
     PREFIX=/usr CFLAGS="-O3 -mtune=native -march=native -flto -ffat-lto-objects" make -j install
 
 
-RUN wget https://github.com/lpereira/lwan/archive/4068da5ce808c279fe1921daa52bfd728229a434.tar.gz -O - | tar xz --strip-components=1 && \
+RUN wget https://github.com/lpereira/lwan/archive/3bb25e235e76028d7687ae4636a059474f42b19c.tar.gz -O - | tar xz --strip-components=1 && \
     mkdir build && cd build && \
     mkdir build && cd build && \
     cmake /lwan -DCMAKE_BUILD_TYPE=Release -DUSE_ALTERNATIVE_MALLOC=mimalloc && \
     cmake /lwan -DCMAKE_BUILD_TYPE=Release -DUSE_ALTERNATIVE_MALLOC=mimalloc && \
     make lwan-static
     make lwan-static

+ 2 - 2
frameworks/C/lwan/lwan.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:19.10
+FROM ubuntu:20.10
 
 
 RUN apt-get update -yqq && \
 RUN apt-get update -yqq && \
 	apt-get install -yqq \
 	apt-get install -yqq \
@@ -18,7 +18,7 @@ RUN mkdir luajit && \
     cd luajit && \
     cd luajit && \
     PREFIX=/usr CFLAGS="-O3 -mtune=native -march=native -flto -ffat-lto-objects" make -j install
     PREFIX=/usr CFLAGS="-O3 -mtune=native -march=native -flto -ffat-lto-objects" make -j install
 
 
-RUN wget https://github.com/lpereira/lwan/archive/4068da5ce808c279fe1921daa52bfd728229a434.tar.gz -O - | tar xz --strip-components=1 && \
+RUN wget https://github.com/lpereira/lwan/archive/3bb25e235e76028d7687ae4636a059474f42b19c.tar.gz -O - | tar xz --strip-components=1 && \
     mkdir build && cd build && \
     mkdir build && cd build && \
     cmake /lwan -DCMAKE_BUILD_TYPE=Release -DUSE_ALTERNATIVE_MALLOC=mimalloc && \
     cmake /lwan -DCMAKE_BUILD_TYPE=Release -DUSE_ALTERNATIVE_MALLOC=mimalloc && \
     make lwan-static
     make lwan-static