Commit08313b0

committed

Fix extension build fail for PG_VERSION >= 11 due to enabled LLVM

1 parente87121b commit08313b0Copy full SHA for 08313b0

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,10 @@ RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \`
`13`	`13`	`fi`
`14`	`14`
`15`	`15`	`RUN if [ "${CHECK_CODE}" = "false" ] ; then \`
`16`		`-echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \`
`17`		`-apk --no-cache add curl python3 gcc make musl-dev;\`
	`16`	`+# echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \`
	`17`	`+# Use alpine/v3.6/main instead of alpine/edge/main to fix version of clang to '8..'`
	`18`	`+# Install clang as well, since LLVM is enabled in PG_VERSION >= 11 by default`
	`19`	`+apk --no-cache add curl python3 gcc clang make musl-dev --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/main;\`
`18`	`20`	`fi`
`19`	`21`
`20`	`22`	`RUN mkdir -p /pg/data && \`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ make USE_PGXS=1 install`
`48`	`48`	`status=$?`
`49`	`49`	`if [$status-ne 0 ];thenexit$status;fi`
`50`	`50`
`51`		`-# addpg_pathman to shared_preload_libraries and restart cluster 'test'`
	`51`	`+# addpg_wait_sampling to shared_preload_libraries and restart cluster 'test'`
`52`	`52`	`echo"shared_preload_libraries = 'pg_wait_sampling'">>$PGDATA/postgresql.conf`
`53`	`53`	`echo"port = 55435">>$PGDATA/postgresql.conf`
`54`	`54`	`pg_ctl start -l /tmp/postgres.log -w`

Comments

(0)