Merge pull request #328 from infosiftr/hipe

Adjust Erlang HiPE compilation to be conditional based on architecture
2019-04-02 14:00:04 -07:00 · 2019-04-02 14:00:04 -07:00 · 2cceb25f6b
parent a7daf64107 b7fe20f9ec
commit 2cceb25f6b
8 changed files with 56 additions and 8 deletions
--- a/3.7-rc/alpine/Dockerfile
+++ b/3.7-rc/alpine/Dockerfile
@ -106,14 +106,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/3.7-rc/ubuntu/Dockerfile
+++ b/3.7-rc/ubuntu/Dockerfile
@ -111,14 +111,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/3.7/alpine/Dockerfile
+++ b/3.7/alpine/Dockerfile
@ -106,14 +106,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/3.7/ubuntu/Dockerfile
+++ b/3.7/ubuntu/Dockerfile
@ -111,14 +111,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/3.8-rc/alpine/Dockerfile
+++ b/3.8-rc/alpine/Dockerfile
@ -106,14 +106,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/3.8-rc/ubuntu/Dockerfile
+++ b/3.8-rc/ubuntu/Dockerfile
@ -111,14 +111,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -106,14 +106,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \
--- a/Dockerfile-ubuntu.template
+++ b/Dockerfile-ubuntu.template
@ -111,14 +111,20 @@ RUN set -eux; \
 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; export CFLAGS; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+	case "$dpkgArch" in \
+# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
+		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
+		*) hipe='--disable-hipe' ;; \
+	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
+		$hipe \
 		--disable-dynamic-ssl-lib \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
-		--enable-hipe \
 		--enable-hybrid-heap \
 		--enable-kernel-poll \
 		--enable-shared-zlib \