From bc44222ff8a2cc66d2060129ecdf228bdb9e0ee8 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 10 May 2017 10:19:28 -0700 Subject: [PATCH 1/2] Add explicit "--build" to our "./configure" invocations --- 9.2/alpine/Dockerfile | 3 +++ 9.2/alpine/docker-entrypoint.sh | 2 +- 9.2/docker-entrypoint.sh | 2 +- 9.3/alpine/Dockerfile | 3 +++ 9.3/alpine/docker-entrypoint.sh | 2 +- 9.3/docker-entrypoint.sh | 2 +- 9.4/alpine/Dockerfile | 3 +++ 9.4/alpine/docker-entrypoint.sh | 2 +- 9.4/docker-entrypoint.sh | 2 +- 9.5/alpine/Dockerfile | 3 +++ 9.5/alpine/docker-entrypoint.sh | 2 +- 9.5/docker-entrypoint.sh | 2 +- 9.6/alpine/Dockerfile | 3 +++ 9.6/alpine/docker-entrypoint.sh | 2 +- 9.6/docker-entrypoint.sh | 2 +- Dockerfile-alpine.template | 3 +++ docker-entrypoint.sh | 2 +- 17 files changed, 29 insertions(+), 11 deletions(-) diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile index b31ed637f6..c6fd87d48b 100644 --- a/9.2/alpine/Dockerfile +++ b/9.2/alpine/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex \ && apk add --no-cache --virtual .build-deps \ bison \ coreutils \ + dpkg-dev dpkg \ flex \ gcc \ # krb5-dev \ @@ -92,9 +93,11 @@ RUN set -ex \ && 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 \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ + --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh index 0b30c05c0c..92223743f9 100755 --- a/9.2/alpine/docker-entrypoint.sh +++ b/9.2/alpine/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh index 354aa3405f..b49b82ccae 100755 --- a/9.2/docker-entrypoint.sh +++ b/9.2/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index ff4232cbfe..1c4cfc54e8 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex \ && apk add --no-cache --virtual .build-deps \ bison \ coreutils \ + dpkg-dev dpkg \ flex \ gcc \ # krb5-dev \ @@ -92,9 +93,11 @@ RUN set -ex \ && 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 \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ + --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh index 0b30c05c0c..92223743f9 100755 --- a/9.3/alpine/docker-entrypoint.sh +++ b/9.3/alpine/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh index 354aa3405f..b49b82ccae 100755 --- a/9.3/docker-entrypoint.sh +++ b/9.3/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index 6da5058c72..76c24e58b8 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -45,6 +45,7 @@ RUN set -ex \ && apk add --no-cache --virtual .build-deps \ bison \ coreutils \ + dpkg-dev dpkg \ flex \ gcc \ # krb5-dev \ @@ -69,9 +70,11 @@ RUN set -ex \ && 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 \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ + --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh index 0b30c05c0c..92223743f9 100755 --- a/9.4/alpine/docker-entrypoint.sh +++ b/9.4/alpine/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh index 354aa3405f..b49b82ccae 100755 --- a/9.4/docker-entrypoint.sh +++ b/9.4/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index c408ae6338..7f0dd2b401 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -45,6 +45,7 @@ RUN set -ex \ && apk add --no-cache --virtual .build-deps \ bison \ coreutils \ + dpkg-dev dpkg \ flex \ gcc \ # krb5-dev \ @@ -69,9 +70,11 @@ RUN set -ex \ && 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 \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ + --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh index 0b30c05c0c..92223743f9 100755 --- a/9.5/alpine/docker-entrypoint.sh +++ b/9.5/alpine/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh index 354aa3405f..b49b82ccae 100755 --- a/9.5/docker-entrypoint.sh +++ b/9.5/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index a97a47d462..537912c6f1 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -45,6 +45,7 @@ RUN set -ex \ && apk add --no-cache --virtual .build-deps \ bison \ coreutils \ + dpkg-dev dpkg \ flex \ gcc \ # krb5-dev \ @@ -69,9 +70,11 @@ RUN set -ex \ && 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 \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ + --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh index 0b30c05c0c..92223743f9 100755 --- a/9.6/alpine/docker-entrypoint.sh +++ b/9.6/alpine/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh index 354aa3405f..b49b82ccae 100755 --- a/9.6/docker-entrypoint.sh +++ b/9.6/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 3ed1875b58..0302780c01 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -46,6 +46,7 @@ RUN set -ex \ && apk add --no-cache --virtual .build-deps \ bison \ coreutils \ + dpkg-dev dpkg \ flex \ gcc \ # krb5-dev \ @@ -71,9 +72,11 @@ RUN set -ex \ && 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 \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ + --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 354aa3405f..b49b82ccae 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then echo "host all all all $authMethod" } >> "$PGDATA/pg_hba.conf" - # internal start of server in order to allow set-up using psql-client + # internal start of server in order to allow set-up using psql-client # does not listen on external TCP/IP and waits until start finishes PGUSER="${PGUSER:-postgres}" \ pg_ctl -D "$PGDATA" \ From 975f6a2705d981f865a2cb0536a86a46e5839534 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 10 May 2017 10:54:54 -0700 Subject: [PATCH 2/2] Explicitly update "config.guess" and "config.sub" (and update "ossp-uuid" code) --- 9.2/alpine/Dockerfile | 8 ++++++++ 9.3/alpine/Dockerfile | 8 ++++++++ 9.4/alpine/Dockerfile | 3 +++ 9.5/alpine/Dockerfile | 3 +++ 9.6/alpine/Dockerfile | 3 +++ Dockerfile-alpine.template | 3 +++ ossp-uuid.template | 5 +++++ 7 files changed, 33 insertions(+) diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile index c6fd87d48b..9c2a529917 100644 --- a/9.2/alpine/Dockerfile +++ b/9.2/alpine/Dockerfile @@ -80,7 +80,12 @@ RUN set -ex \ && rm uuid.tar.gz \ && ( \ cd /usr/src/ossp-uuid \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ && ./configure \ + --build="$gnuArch" \ --prefix=/usr/local \ && make -j "$(nproc)" \ && make install \ @@ -94,6 +99,9 @@ RUN set -ex \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index 1c4cfc54e8..af8efc15fc 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -80,7 +80,12 @@ RUN set -ex \ && rm uuid.tar.gz \ && ( \ cd /usr/src/ossp-uuid \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ && ./configure \ + --build="$gnuArch" \ --prefix=/usr/local \ && make -j "$(nproc)" \ && make install \ @@ -94,6 +99,9 @@ RUN set -ex \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index 76c24e58b8..4af5e04d8c 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -71,6 +71,9 @@ RUN set -ex \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index 7f0dd2b401..26f5d2dd1a 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -71,6 +71,9 @@ RUN set -ex \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index 537912c6f1..cebeb25be8 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -71,6 +71,9 @@ RUN set -ex \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0302780c01..3d8349a32b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -73,6 +73,9 @@ RUN set -ex \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 && ./configure \ diff --git a/ossp-uuid.template b/ossp-uuid.template index aced4977eb..3a22d20a07 100644 --- a/ossp-uuid.template +++ b/ossp-uuid.template @@ -11,7 +11,12 @@ && rm uuid.tar.gz \ && ( \ cd /usr/src/ossp-uuid \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# explicitly update autoconf config.guess and config.sub so they support more arches/libcs + && wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \ + && wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \ && ./configure \ + --build="$gnuArch" \ --prefix=/usr/local \ && make -j "$(nproc)" \ && make install \