Skip to content

Limit ucontext linking to arm32* and s390x arches #366

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
Oct 28, 2021
Merged

Limit ucontext linking to arm32* and s390x arches #366

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
1 change: 0 additions & 1 deletion 2.6/alpine3.13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion 2.6/alpine3.14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions 2.7/alpine3.13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions 2.7/alpine3.14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion 3.0/alpine3.13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion 3.0/alpine3.14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ RUN set -eux; \
libffi-dev \
libxml2-dev \
libxslt-dev \
libucontext-dev \
linux-headers \
make \
ncurses-dev \
Expand Down Expand Up @@ -165,10 +164,18 @@ RUN set -eux; \
mv file.c.new file.c; \
\
autoconf; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
{{ if is_alpine and env.version == "2.7" then ( -}}
export LIBS='-lucontext'; \
{{ if is_alpine and ( [ "2.7", "3.0" ] | index(env.version) ) then ( -}}
# fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308
# and don't break the other arches: https://github.com/docker-library/ruby/issues/365
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
s390x | armhf | armv7) \
apk add --no-cache libucontext-dev; \
export LIBS='-lucontext'; \
;; \
esac; \
{{ ) else "" end -}}
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \
--build="$gnuArch" \
--disable-install-doc \
Expand Down