Browse Source

Lithium update. (#6460)

Matthieu Garrigues 4 years ago
parent
commit
2dcee155de

+ 11 - 5
frameworks/C++/lithium/compile_libpq.sh

@@ -1,14 +1,20 @@
 #! /bin/sh
 #! /bin/sh
 
 
 # Compile libpq
 # Compile libpq
-commit=b787d4ce6d910080065025bcd5f968544997271f
 
 
-wget -nv https://github.com/postgres/postgres/archive/$commit.zip
-unzip -q $commit.zip
-cd postgres-$commit
-if [ "$1" = "batchmode" ]; then
+
+if [ "$1" = "batchmode_patch" ]; then
+  commit=b787d4ce6d910080065025bcd5f968544997271f
+  wget -nv https://github.com/postgres/postgres/archive/$commit.zip
+  unzip -q $commit.zip
+  cd postgres-$commit
   wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
   wget -nv https://www.postgresql.org/message-id/attachment/115223/v22-0001-libpq-batch.patch
   git apply ./v22-0001-libpq-batch.patch
   git apply ./v22-0001-libpq-batch.patch
+else
+  commit=7f7f25f15edb6eacec58179ef5285e874aa4435b
+  wget -nv https://github.com/postgres/postgres/archive/$commit.zip
+  unzip -q $commit.zip
+  cd postgres-$commit
 fi
 fi
 
 
 ./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'
 ./configure --prefix=/usr CFLAGS='-O3 -march=native -flto'

+ 2 - 2
frameworks/C++/lithium/lithium-postgres-batch-beta.dockerfile

@@ -7,7 +7,7 @@ RUN apt-get install -yqq bison flex
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN ./compile_libpq.sh batchmode
+RUN ./compile_libpq.sh
 ENV LD_LIBRARY_PATH=/usr/lib
 ENV LD_LIBRARY_PATH=/usr/lib
 
 
-CMD ./compile-batch.sh TFB_PGSQL  16b3f43a2b292e5349b7b528fa9410b3239c15cb
+CMD ./compile-batch.sh TFB_PGSQL 78ccb291a94679bf567ece2428d2763d80fc0029

+ 1 - 1
frameworks/C++/lithium/lithium-postgres-batch.dockerfile

@@ -6,7 +6,7 @@ RUN apt-get install -yqq bison flex
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN ./compile_libpq.sh batchmode
+RUN ./compile_libpq.sh batchmode_patch
 ENV LD_LIBRARY_PATH=/usr/lib
 ENV LD_LIBRARY_PATH=/usr/lib
 
 
 EXPOSE 8080
 EXPOSE 8080