Skip to content
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

Fix Android’s CPU features #339

Merged
merged 2 commits into from
Oct 27, 2019
Merged

Fix Android’s CPU features #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
950a141
Fix Android’s CPU features
nagisa Oct 26, 2019
b3beb5e
Bump kernel versions for ppc64 and sparc64
nagisa Oct 27, 2019
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
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
# Libz is distributed in the android ndk, but for some unknown reason it is not
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu Penryn" \
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu qemu64,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt" \
CC_x86_64_linux_android=x86_64-linux-android-gcc \
CXX_x86_64_linux_android=x86_64-linux-android-g++ \
DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
Expand Down
8 changes: 4 additions & 4 deletions docker/linux-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ main() {
powerpc64)
# there is no stable port
arch=ppc64
# https://packages.debian.org/de/sid/linux-image-powerpc64
kernel=5.2.0-3-powerpc64
# https://packages.debian.org/en/sid/linux-image-powerpc64
kernel=5.3.0-1-powerpc64
debsource="deb http://ftp.ports.debian.org/debian-ports unreleased main"
debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports unstable main"
# sid version of dropbear requires these dependencies
Expand All @@ -66,8 +66,8 @@ main() {
;;
sparc64)
# there is no stable port
# https://packages.debian.org/de/sid/linux-image-sparc64
kernel=5.2.0-3-sparc64
# https://packages.debian.org/en/sid/linux-image-sparc64
kernel=5.3.0-1-sparc64
debsource="deb http://ftp.ports.debian.org/debian-ports unreleased main"
debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports unstable main"
# sid version of dropbear requires these dependencies
Expand Down