From fbc438936d086d3ad5c7d2763446e3cf829288fb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 12 May 2023 16:51:33 -0700 Subject: [PATCH] Add `--enable-option-checking=fatal` to `configure` flags Also, remove deprecated/removed `--with-krb5` (deprecated in 8.3, removed in 9.4; https://github.com/postgres/postgres/commit/98de86e4221a418d670db86bf28ff15e880beadc). --- 11/alpine/Dockerfile | 2 +- 12/alpine/Dockerfile | 2 +- 13/alpine/Dockerfile | 2 +- 14/alpine/Dockerfile | 2 +- 15/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 6dad831545..ff1b3973f3 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -90,6 +90,7 @@ RUN set -eux; \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 ./configure \ + --enable-option-checking=fatal \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ @@ -106,7 +107,6 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - --with-krb5 \ --with-gssapi \ --with-ldap \ --with-tcl \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 4698d75fc9..74854956da 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -90,6 +90,7 @@ RUN set -eux; \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 ./configure \ + --enable-option-checking=fatal \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ @@ -106,7 +107,6 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - --with-krb5 \ --with-gssapi \ --with-ldap \ --with-tcl \ diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 29262473d4..2f3fc74b83 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -90,6 +90,7 @@ RUN set -eux; \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 ./configure \ + --enable-option-checking=fatal \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ @@ -106,7 +107,6 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - --with-krb5 \ --with-gssapi \ --with-ldap \ --with-tcl \ diff --git a/14/alpine/Dockerfile b/14/alpine/Dockerfile index 5c216546ce..464e468939 100644 --- a/14/alpine/Dockerfile +++ b/14/alpine/Dockerfile @@ -92,6 +92,7 @@ RUN set -eux; \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 ./configure \ + --enable-option-checking=fatal \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ @@ -108,7 +109,6 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - --with-krb5 \ --with-gssapi \ --with-ldap \ --with-tcl \ diff --git a/15/alpine/Dockerfile b/15/alpine/Dockerfile index ef886cc3ab..afbbfcaa27 100644 --- a/15/alpine/Dockerfile +++ b/15/alpine/Dockerfile @@ -94,6 +94,7 @@ RUN set -eux; \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 ./configure \ + --enable-option-checking=fatal \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ @@ -110,7 +111,6 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - --with-krb5 \ --with-gssapi \ --with-ldap \ --with-tcl \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index deae2546c1..90a4e40d91 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -93,6 +93,7 @@ RUN set -eux; \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 ./configure \ + --enable-option-checking=fatal \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ @@ -109,7 +110,6 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - --with-krb5 \ --with-gssapi \ --with-ldap \ --with-tcl \