Use aarch_64 in a consistent way (#10845)

Motivation:

We should use aarch_64 in our classifier / jni libname on aarch64 as  os.detected.arch uses the name. Being non consistent (especially across our different projects) already gave us a lot of trouble in the past.
Let's fix this once for all.

Modifications:

Use aarch_64

Result:

More consistent classifier usage on aarch64
This commit is contained in:
Norman Maurer 2020-12-07 12:14:23 +01:00 committed by GitHub
parent abd5a7d922
commit 3ac9685580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 6 deletions

View File

@ -71,7 +71,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-aarch64</classifier> <classifier>linux-aarch_64</classifier>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -107,7 +107,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-aarch64</classifier> <classifier>linux-aarch_64</classifier>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

View File

@ -19,7 +19,7 @@ docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-7.1
## aarch64 cross compile for transport-native-epoll on X86_64 ## aarch64 cross compile for transport-native-epoll on X86_64
``` ```
docker-compose -f docker/docker-compose.yaml run cross-compile-aarch64 docker-compose -f docker/docker-compose.yaml run cross-compile-aarch64-build
``` ```
The default version of aarch64 gcc is `4.9-2016.02`. Update the parameter `gcc_version` in `docker-compose.yaml` to use a version you want. The default version of aarch64 gcc is `4.9-2016.02`. Update the parameter `gcc_version` in `docker-compose.yaml` to use a version you want.

View File

@ -49,7 +49,18 @@ services:
args: args:
gcc_version : "4.9-2016.02" gcc_version : "4.9-2016.02"
cross-compile-aarch64: cross-compile-aarch64-shell:
image: netty:cross_compile_aarch64
depends_on: [cross-compile-aarch64-runtime-setup]
volumes:
- ~/.ssh:/root/.ssh:delegated
- ~/.gnupg:/root/.gnupg:delegated
- ..:/code:delegated
- ~/.m2:/root/.m2:delegated
entrypoint: /bin/bash
working_dir: /code
cross-compile-aarch64-build:
image: netty:cross_compile_aarch64 image: netty:cross_compile_aarch64
depends_on: [cross-compile-aarch64-runtime-setup] depends_on: [cross-compile-aarch64-runtime-setup]
volumes: volumes:

View File

@ -213,7 +213,8 @@
<profile> <profile>
<id>linux-aarch64</id> <id>linux-aarch64</id>
<properties> <properties>
<jni.classifier>${os.detected.name}-aarch64</jni.classifier> <!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
<jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
</properties> </properties>
<build> <build>
<pluginManagement> <pluginManagement>

View File

@ -244,7 +244,8 @@
<profile> <profile>
<id>linux-aarch64</id> <id>linux-aarch64</id>
<properties> <properties>
<jni.classifier>${os.detected.name}-aarch64</jni.classifier> <!-- use aarch_64 as this is also what os.detected.arch will use on an aarch64 system -->
<jni.classifier>${os.detected.name}-aarch_64</jni.classifier>
<jni.platform>linux</jni.platform> <jni.platform>linux</jni.platform>
<exe.compiler>aarch64-linux-gnu-gcc</exe.compiler> <exe.compiler>aarch64-linux-gnu-gcc</exe.compiler>
<exe.archiver>aarch64-linux-gnu-ar</exe.archiver> <exe.archiver>aarch64-linux-gnu-ar</exe.archiver>