Skip to content

Commit fc161dc

Browse files
authored
Merge pull request tianon#45 from chaifeng/fix-job-control
Fix missing Job Control builtins in Bash 3.0-4.3 and stabilize Bash 3.x builds
2 parents 9088986 + ddea3cd commit fc161dc

File tree

8 files changed

+25
-3
lines changed

8 files changed

+25
-3
lines changed

Diff for: 3.0/Dockerfile

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 3.1/Dockerfile

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 3.2/Dockerfile

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 4.0/Dockerfile

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 4.1/Dockerfile

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 4.2/Dockerfile

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 4.3/Dockerfile

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Dockerfile.template

+8
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ RUN set -eux; \
115115
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
116116
done; \
117117
{{ ) end -}}
118+
{{ if env.version | IN("3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "4.3") then ( -}}
119+
# https://github.com/tianon/docker-bash/pull/45
120+
export CFLAGS='-Wno-error=implicit-int -Wno-error=implicit-function-declaration'; \
121+
{{ ) else "" end -}}
118122
./configure \
119123
--build="$gnuArch" \
120124
--enable-readline \
@@ -135,7 +139,11 @@ RUN set -eux; \
135139
# parallel jobs workaround borrowed from Alpine :)
136140
make y.tab.c; make builtins/libbuiltins.a; \
137141
{{ ) end -}}
142+
{{ if env.version | startswith("3.") then ( -}}
143+
make -j 1; \
144+
{{ ) else ( -}}
138145
make -j "$(nproc)"; \
146+
{{ ) end -}}
139147
make install; \
140148
cd /; \
141149
rm -r /usr/local/src/bash; \

0 commit comments

Comments
 (0)