Skip to content

Commit bc44222

Browse files
tianontianon
committed
Add explicit "--build" to our "./configure" invocations
1 parent 5fddf91 commit bc44222

17 files changed

+29
-11
lines changed

‎9.2/alpine/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ RUN set -ex \
4848
&& apk add --no-cache --virtual .build-deps \
4949
bison \
5050
coreutils \
51+
dpkg-dev dpkg \
5152
flex \
5253
gcc \
5354
# krb5-dev \
@@ -92,9 +93,11 @@ RUN set -ex \
9293
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
9394
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
9495
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
96+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
9597
# configure options taken from:
9698
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
9799
&& ./configure \
100+
--build="$gnuArch" \
98101
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
99102
# --enable-nls \
100103
--enable-integer-datetimes \

‎9.2/alpine/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
9191
echo "host all all all $authMethod"
9292
} >> "$PGDATA/pg_hba.conf"
9393

94-
# internal start of server in order to allow set-up using psql-client
94+
# internal start of server in order to allow set-up using psql-client
9595
# does not listen on external TCP/IP and waits until start finishes
9696
PGUSER="${PGUSER:-postgres}" \
9797
pg_ctl -D "$PGDATA" \

‎9.2/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
9191
echo "host all all all $authMethod"
9292
} >> "$PGDATA/pg_hba.conf"
9393

94-
# internal start of server in order to allow set-up using psql-client
94+
# internal start of server in order to allow set-up using psql-client
9595
# does not listen on external TCP/IP and waits until start finishes
9696
PGUSER="${PGUSER:-postgres}" \
9797
pg_ctl -D "$PGDATA" \

‎9.3/alpine/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ RUN set -ex \
4848
&& apk add --no-cache --virtual .build-deps \
4949
bison \
5050
coreutils \
51+
dpkg-dev dpkg \
5152
flex \
5253
gcc \
5354
# krb5-dev \
@@ -92,9 +93,11 @@ RUN set -ex \
9293
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
9394
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
9495
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
96+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
9597
# configure options taken from:
9698
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
9799
&& ./configure \
100+
--build="$gnuArch" \
98101
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
99102
# --enable-nls \
100103
--enable-integer-datetimes \

‎9.3/alpine/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
9191
echo "host all all all $authMethod"
9292
} >> "$PGDATA/pg_hba.conf"
9393

94-
# internal start of server in order to allow set-up using psql-client
94+
# internal start of server in order to allow set-up using psql-client
9595
# does not listen on external TCP/IP and waits until start finishes
9696
PGUSER="${PGUSER:-postgres}" \
9797
pg_ctl -D "$PGDATA" \

‎9.3/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
9191
echo "host all all all $authMethod"
9292
} >> "$PGDATA/pg_hba.conf"
9393

94-
# internal start of server in order to allow set-up using psql-client
94+
# internal start of server in order to allow set-up using psql-client
9595
# does not listen on external TCP/IP and waits until start finishes
9696
PGUSER="${PGUSER:-postgres}" \
9797
pg_ctl -D "$PGDATA" \

‎9.4/alpine/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN set -ex \
4545
&& apk add --no-cache --virtual .build-deps \
4646
bison \
4747
coreutils \
48+
dpkg-dev dpkg \
4849
flex \
4950
gcc \
5051
# krb5-dev \
@@ -69,9 +70,11 @@ RUN set -ex \
6970
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
7071
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
7172
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
73+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
7274
# configure options taken from:
7375
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
7476
&& ./configure \
77+
--build="$gnuArch" \
7578
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
7679
# --enable-nls \
7780
--enable-integer-datetimes \

‎9.4/alpine/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
9191
echo "host all all all $authMethod"
9292
} >> "$PGDATA/pg_hba.conf"
9393

94-
# internal start of server in order to allow set-up using psql-client
94+
# internal start of server in order to allow set-up using psql-client
9595
# does not listen on external TCP/IP and waits until start finishes
9696
PGUSER="${PGUSER:-postgres}" \
9797
pg_ctl -D "$PGDATA" \

‎9.4/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
9191
echo "host all all all $authMethod"
9292
} >> "$PGDATA/pg_hba.conf"
9393

94-
# internal start of server in order to allow set-up using psql-client
94+
# internal start of server in order to allow set-up using psql-client
9595
# does not listen on external TCP/IP and waits until start finishes
9696
PGUSER="${PGUSER:-postgres}" \
9797
pg_ctl -D "$PGDATA" \

‎9.5/alpine/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN set -ex \
4545
&& apk add --no-cache --virtual .build-deps \
4646
bison \
4747
coreutils \
48+
dpkg-dev dpkg \
4849
flex \
4950
gcc \
5051
# krb5-dev \
@@ -69,9 +70,11 @@ RUN set -ex \
6970
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
7071
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
7172
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
73+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
7274
# configure options taken from:
7375
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
7476
&& ./configure \
77+
--build="$gnuArch" \
7578
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
7679
# --enable-nls \
7780
--enable-integer-datetimes \

0 commit comments

Comments
 (0)