Skip to content

Commit 975f6a2

Browse files
tianontianon
committed
Explicitly update "config.guess" and "config.sub" (and update "ossp-uuid" code)
1 parent bc44222 commit 975f6a2

File tree

7 files changed

+33
-0
lines changed

7 files changed

+33
-0
lines changed

‎9.2/alpine/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,12 @@ RUN set -ex \
8080
&& rm uuid.tar.gz \
8181
&& ( \
8282
cd /usr/src/ossp-uuid \
83+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
84+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
85+
&& wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
86+
&& wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
8387
&& ./configure \
88+
--build="$gnuArch" \
8489
--prefix=/usr/local \
8590
&& make -j "$(nproc)" \
8691
&& make install \
@@ -94,6 +99,9 @@ RUN set -ex \
9499
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
95100
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
96101
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
102+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
103+
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
104+
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
97105
# configure options taken from:
98106
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
99107
&& ./configure \

‎9.3/alpine/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,12 @@ RUN set -ex \
8080
&& rm uuid.tar.gz \
8181
&& ( \
8282
cd /usr/src/ossp-uuid \
83+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
84+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
85+
&& wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
86+
&& wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
8387
&& ./configure \
88+
--build="$gnuArch" \
8489
--prefix=/usr/local \
8590
&& make -j "$(nproc)" \
8691
&& make install \
@@ -94,6 +99,9 @@ RUN set -ex \
9499
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
95100
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
96101
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
102+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
103+
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
104+
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
97105
# configure options taken from:
98106
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
99107
&& ./configure \

‎9.4/alpine/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ RUN set -ex \
7171
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
7272
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
7373
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
74+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
75+
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
76+
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
7477
# configure options taken from:
7578
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
7679
&& ./configure \

‎9.5/alpine/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ RUN set -ex \
7171
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
7272
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
7373
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
74+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
75+
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
76+
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
7477
# configure options taken from:
7578
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
7679
&& ./configure \

‎9.6/alpine/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ RUN set -ex \
7171
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
7272
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
7373
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
74+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
75+
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
76+
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
7477
# configure options taken from:
7578
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
7679
&& ./configure \

‎Dockerfile-alpine.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ RUN set -ex \
7373
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
7474
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
7575
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
76+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
77+
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
78+
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
7679
# configure options taken from:
7780
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
7881
&& ./configure \

‎ossp-uuid.template

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
&& rm uuid.tar.gz \
1212
&& ( \
1313
cd /usr/src/ossp-uuid \
14+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
15+
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
16+
&& wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
17+
&& wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
1418
&& ./configure \
19+
--build="$gnuArch" \
1520
--prefix=/usr/local \
1621
&& make -j "$(nproc)" \
1722
&& make install \

0 commit comments

Comments
 (0)