fixup
This commit is contained in:
parent
41402ac3d1
commit
3a7be2f321
|
|
@ -119,8 +119,8 @@ RUN set -eux; \
|
||||||
--with-icu \
|
--with-icu \
|
||||||
--with-llvm \
|
--with-llvm \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -119,8 +119,8 @@ RUN set -eux; \
|
||||||
--with-icu \
|
--with-icu \
|
||||||
--with-llvm \
|
--with-llvm \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -119,8 +119,8 @@ RUN set -eux; \
|
||||||
--with-icu \
|
--with-icu \
|
||||||
--with-llvm \
|
--with-llvm \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -119,8 +119,8 @@ RUN set -eux; \
|
||||||
--with-icu \
|
--with-icu \
|
||||||
--with-llvm \
|
--with-llvm \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -122,8 +122,8 @@ RUN set -eux; \
|
||||||
--with-llvm \
|
--with-llvm \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -122,8 +122,8 @@ RUN set -eux; \
|
||||||
--with-llvm \
|
--with-llvm \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -125,8 +125,8 @@ RUN set -eux; \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -125,8 +125,8 @@ RUN set -eux; \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -124,8 +124,8 @@ RUN set -eux; \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -124,8 +124,8 @@ RUN set -eux; \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" world; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install-world; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -123,8 +123,8 @@ RUN set -eux; \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" all; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -123,8 +123,8 @@ RUN set -eux; \
|
||||||
--with-lz4 \
|
--with-lz4 \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
; \
|
; \
|
||||||
make -j "$(nproc)" all; \
|
make -j "$(nproc)" world-bin; \
|
||||||
make install; \
|
make install-world-bin; \
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
|
|
@ -135,13 +135,8 @@ RUN set -eux; \
|
||||||
--with-zstd \
|
--with-zstd \
|
||||||
{{ ) else "" end -}}
|
{{ ) else "" end -}}
|
||||||
; \
|
; \
|
||||||
{{ if .major >= 17 then ( -}}
|
make -j "$(nproc)" world-bin; \
|
||||||
make -j "$(nproc)" all; \
|
make install-world-bin; \
|
||||||
make install; \
|
|
||||||
{{ ) else ( -}}
|
|
||||||
make -j "$(nproc)" world; \
|
|
||||||
make install-world; \
|
|
||||||
{{ ) end -}}
|
|
||||||
make -C contrib install; \
|
make -C contrib install; \
|
||||||
\
|
\
|
||||||
runDeps="$( \
|
runDeps="$( \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue