mirror of
https://github.com/tianon/docker-bash.git
synced 2026-11-19 16:06:17 +03:00
Fix missing Job Control builtins in Bash 3.0-4.3 and stabilize Bash 3.x builds
This commit is contained in:
1 parent
908898685c
commit
ddea3cd1ca
8 files changed
+25
-3
No files matched your search
Generated
+3
-1
@@ -100,6 +100,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
@@ -113,7 +115,7 @@ RUN set -eux; \
|
||||
}; \
|
||||
# parallel jobs workaround borrowed from Alpine :)
|
||||
make y.tab.c; make builtins/libbuiltins.a; \
|
||||
make -j "$(nproc)"; \
|
||||
make -j 1; \
|
||||
make install; \
|
||||
cd /; \
|
||||
rm -r /usr/local/src/bash; \
|
||||
|
||||
Generated
+3
-1
@@ -99,6 +99,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
@@ -112,7 +114,7 @@ RUN set -eux; \
|
||||
}; \
|
||||
# parallel jobs workaround borrowed from Alpine :)
|
||||
make y.tab.c; make builtins/libbuiltins.a; \
|
||||
make -j "$(nproc)"; \
|
||||
make -j 1; \
|
||||
make install; \
|
||||
cd /; \
|
||||
rm -r /usr/local/src/bash; \
|
||||
|
||||
Generated
+3
-1
@@ -100,6 +100,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
@@ -113,7 +115,7 @@ RUN set -eux; \
|
||||
}; \
|
||||
# parallel jobs workaround borrowed from Alpine :)
|
||||
make y.tab.c; make builtins/libbuiltins.a; \
|
||||
make -j "$(nproc)"; \
|
||||
make -j 1; \
|
||||
make install; \
|
||||
cd /; \
|
||||
rm -r /usr/local/src/bash; \
|
||||
|
||||
Generated
+2
@@ -99,6 +99,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
|
||||
Generated
+2
@@ -99,6 +99,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
|
||||
Generated
+2
@@ -100,6 +100,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
|
||||
Generated
+2
@@ -100,6 +100,8 @@ RUN set -eux; \
|
||||
for f in config.guess config.sub; do \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
|
||||
@@ -115,6 +115,10 @@ RUN set -eux; \
|
||||
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
|
||||
done; \
|
||||
{{ ) end -}}
|
||||
{{ if env.version | IN("3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "4.3") then ( -}}
|
||||
# https://github.com/tianon/docker-bash/pull/45
|
||||
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
|
||||
{{ ) else "" end -}}
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--enable-readline \
|
||||
@@ -135,7 +139,11 @@ RUN set -eux; \
|
||||
# parallel jobs workaround borrowed from Alpine :)
|
||||
make y.tab.c; make builtins/libbuiltins.a; \
|
||||
{{ ) end -}}
|
||||
{{ if env.version | startswith("3.") then ( -}}
|
||||
make -j 1; \
|
||||
{{ ) else ( -}}
|
||||
make -j "$(nproc)"; \
|
||||
{{ ) end -}}
|
||||
make install; \
|
||||
cd /; \
|
||||
rm -r /usr/local/src/bash; \
|
||||
|
||||
Reference in new issue
Block a user