Merge pull request #870 from infosiftr/s390x

yosifkit · web-flow · commit b381c53c899e · 2019-07-29T15:49:07.000-07:00
Update s390x test to the proper dpkg-architecture value
diff --git a/7.1/alpine3.10/cli/Dockerfile b/7.1/alpine3.10/cli/Dockerfile
@@ -139,7 +139,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.1/alpine3.10/fpm/Dockerfile b/7.1/alpine3.10/fpm/Dockerfile
@@ -140,7 +140,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.1/alpine3.10/zts/Dockerfile b/7.1/alpine3.10/zts/Dockerfile
@@ -140,7 +140,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.1/alpine3.9/cli/Dockerfile b/7.1/alpine3.9/cli/Dockerfile
@@ -139,7 +139,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.1/alpine3.9/fpm/Dockerfile b/7.1/alpine3.9/fpm/Dockerfile
@@ -140,7 +140,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.1/alpine3.9/zts/Dockerfile b/7.1/alpine3.9/zts/Dockerfile
@@ -140,7 +140,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.2/alpine3.10/cli/Dockerfile b/7.2/alpine3.10/cli/Dockerfile
@@ -145,7 +145,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.2/alpine3.10/fpm/Dockerfile b/7.2/alpine3.10/fpm/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.2/alpine3.10/zts/Dockerfile b/7.2/alpine3.10/zts/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.2/alpine3.9/cli/Dockerfile b/7.2/alpine3.9/cli/Dockerfile
@@ -145,7 +145,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.2/alpine3.9/fpm/Dockerfile b/7.2/alpine3.9/fpm/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.2/alpine3.9/zts/Dockerfile b/7.2/alpine3.9/zts/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.3/alpine3.10/cli/Dockerfile b/7.3/alpine3.10/cli/Dockerfile
@@ -145,7 +145,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.3/alpine3.10/fpm/Dockerfile b/7.3/alpine3.10/fpm/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.3/alpine3.10/zts/Dockerfile b/7.3/alpine3.10/zts/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.3/alpine3.9/cli/Dockerfile b/7.3/alpine3.9/cli/Dockerfile
@@ -145,7 +145,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.3/alpine3.9/fpm/Dockerfile b/7.3/alpine3.9/fpm/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.3/alpine3.9/zts/Dockerfile b/7.3/alpine3.9/zts/Dockerfile
@@ -146,7 +146,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.4-rc/alpine3.10/cli/Dockerfile b/7.4-rc/alpine3.10/cli/Dockerfile
@@ -149,7 +149,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.4-rc/alpine3.10/fpm/Dockerfile b/7.4-rc/alpine3.10/fpm/Dockerfile
@@ -150,7 +150,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/7.4-rc/alpine3.10/zts/Dockerfile b/7.4-rc/alpine3.10/zts/Dockerfile
@@ -150,7 +150,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -143,7 +143,7 @@ RUN set -eux; \
 		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
-		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
+		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \
 	; \

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ RUN set -eux; \`
`139`	`139`	`\`
`140`	`140`	`# bundled pcre does not support JIT on s390x`
`141`	`141`	`# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT`
`142`		`- $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \`
	`142`	`+ $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \`
`143`	`143`	`\`
`144`	`144`	`${PHP_EXTRA_CONFIGURE_ARGS:-} \`
`145`	`145`	`; \`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ RUN set -eux; \`
`140`	`140`	`\`
`141`	`141`	`# bundled pcre does not support JIT on s390x`
`142`	`142`	`# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT`
`143`		`- $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \`
	`143`	`+ $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \`
`144`	`144`	`\`
`145`	`145`	`${PHP_EXTRA_CONFIGURE_ARGS:-} \`
`146`	`146`	`; \`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ RUN set -eux; \`
`145`	`145`	`\`
`146`	`146`	`# bundled pcre does not support JIT on s390x`
`147`	`147`	`# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT`
`148`		`- $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \`
	`148`	`+ $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \`
`149`	`149`	`\`
`150`	`150`	`${PHP_EXTRA_CONFIGURE_ARGS:-} \`
`151`	`151`	`; \`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ RUN set -eux; \`
`146`	`146`	`\`
`147`	`147`	`# bundled pcre does not support JIT on s390x`
`148`	`148`	`# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT`
`149`		`- $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \`
	`149`	`+ $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \`
`150`	`150`	`\`
`151`	`151`	`${PHP_EXTRA_CONFIGURE_ARGS:-} \`
`152`	`152`	`; \`