Skip to content

Add explicit "--build" to our "./configure" invocations #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianon merged 1 commit into from
Mar 29, 2017
Merged

Add explicit "--build" to our "./configure" invocations #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion 3.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -90,7 +98,7 @@ RUN set -ex; \
}; \
# parallel jobs workaround borrowed from Alpine :)
make y.tab.c; make builtins/libbuiltins.a; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
10 changes: 9 additions & 1 deletion 3.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -90,7 +98,7 @@ RUN set -ex; \
}; \
# parallel jobs workaround borrowed from Alpine :)
make y.tab.c; make builtins/libbuiltins.a; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
10 changes: 9 additions & 1 deletion 3.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -90,7 +98,7 @@ RUN set -ex; \
}; \
# parallel jobs workaround borrowed from Alpine :)
make y.tab.c; make builtins/libbuiltins.a; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
12 changes: 9 additions & 3 deletions 4.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ RUN set -ex; \
autoconf \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -79,7 +81,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -89,9 +97,7 @@ RUN set -ex; \
cat >&2 config.log; \
false; \
}; \
# parallel jobs workaround borrowed from Alpine :)
make y.tab.c; make builtins/libbuiltins.a; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
10 changes: 9 additions & 1 deletion 4.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -88,7 +96,7 @@ RUN set -ex; \
cat >&2 config.log; \
false; \
}; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
10 changes: 9 additions & 1 deletion 4.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -88,7 +96,7 @@ RUN set -ex; \
cat >&2 config.log; \
false; \
}; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
10 changes: 9 additions & 1 deletion 4.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -88,7 +96,7 @@ RUN set -ex; \
cat >&2 config.log; \
false; \
}; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down
10 changes: 9 additions & 1 deletion 4.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \
bison \
ca-certificates \
coreutils \
dpkg-dev dpkg \
gcc \
gnupg \
libc-dev \
Expand Down Expand Up @@ -78,7 +80,13 @@ RUN set -ex; \
fi; \
\
cd /usr/src/bash; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
for f in config.guess config.sub; do \
wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
done; \
./configure \
--build="$gnuArch" \
--enable-readline \
--with-curses \
# musl does not implement brk/sbrk (they simply return -ENOMEM)
Expand All @@ -88,7 +96,7 @@ RUN set -ex; \
cat >&2 config.log; \
false; \
}; \
make -j "$(getconf _NPROCESSORS_ONLN)"; \
make -j "$(nproc)"; \
make install; \
cd /; \
rm -r /usr/src/bash; \
Expand Down