Prechádzať zdrojové kódy

Switch to the YAJL version provided by Ubuntu (#3836)

This change should reduce the h2o build times a bit.
Anton Kirilov 7 rokov pred
rodič
commit
7021189a11

+ 1 - 15
frameworks/C/h2o/h2o.dockerfile

@@ -4,7 +4,7 @@ COPY ./ ./
 
 RUN apt update && \
     apt install -yqq autoconf bison cmake curl file flex g++ git libnuma-dev libpq-dev libssl-dev \
-                     libtool make wget
+                     libtool libyajl-dev make wget
 
 ### Install mustache-c
 
@@ -19,20 +19,6 @@ RUN git clone "https://github.com/x86-64/mustache-c.git" "$MUSTACHE_C_BUILD_DIR"
 
 ENV LD_LIBRARY_PATH="${MUSTACHE_C_HOME}/lib:$LD_LIBRARY_PATH"
 
-### Install yajl
-
-ENV YAJL_VERSION=2.1.0
-ENV YAJL_ARCHIVE="${YAJL_VERSION}.tar.gz"
-ENV YAJL_HOME=/yajl
-
-RUN wget -qO "$YAJL_ARCHIVE" "https://github.com/lloyd/yajl/archive/$YAJL_ARCHIVE" && \
-    tar xf "$YAJL_ARCHIVE" && \
-    cd "yajl-$YAJL_VERSION" && \
-    ./configure -p "$YAJL_HOME" && \
-    make -j "$(nproc)" install
-
-ENV LD_LIBRARY_PATH="${YAJL_HOME}/lib:$LD_LIBRARY_PATH"
-
 ### Install h2o
 
 ENV H2O_VERSION=2.2.4

+ 1 - 1
frameworks/C/h2o/start-servers.sh

@@ -24,7 +24,7 @@ fi
 build_h2o_app()
 {
 	cmake -DCMAKE_INSTALL_PREFIX="$H2O_APP_HOME" -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_PREFIX_PATH="${H2O_HOME};${MUSTACHE_C_HOME};${YAJL_HOME}" \
+	      -DCMAKE_PREFIX_PATH="${H2O_HOME};${MUSTACHE_C_HOME}" \
 	      -DCMAKE_C_FLAGS="-march=native $1" "$TROOT"
 	make -j "$CPU_COUNT"
 }