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.

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 native library packaging when cross-compile on m1 for intel #12865

Merged
merged 4 commits into from Oct 5, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions resolver-dns-native-macos/pom.xml
Expand Up @@ -286,7 +286,7 @@
<execution>
<id>build-native-lib</id>
<configuration>
<name>netty_resolver_dns_native_macos_x86_64</name>
<name>netty5_resolver_dns_native_macos_x86_64</name>
<nativeSourceDirectory>${project.basedir}/src/main/c</nativeSourceDirectory>
<libDirectory>${project.build.outputDirectory}</libDirectory>
<!-- We use Maven's artifact classifier instead.
Expand Down Expand Up @@ -324,7 +324,7 @@
</manifest>
<manifestEntries>
<Bundle-NativeCode>META-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib; osname=MacOSX; processor=x86_64</Bundle-NativeCode>
normanmaurer marked this conversation as resolved.
Show resolved Hide resolved
<Fragment-Host>io.netty.resolver-dns-classes-macos</Fragment-Host>
<Fragment-Host>io.netty5.resolver-dns-classes-macos</Fragment-Host>
<Automatic-Module-Name>${javaModuleName}</Automatic-Module-Name>
</manifestEntries>
<index>true</index>
Expand Down
6 changes: 3 additions & 3 deletions transport-native-kqueue/pom.xml
Expand Up @@ -287,7 +287,7 @@
<execution>
<id>build-native-lib</id>
<configuration>
<name>netty_transport_native_kqueue_aarch_64</name>
<name>netty5_transport_native_kqueue_x86_64</name>
<nativeSourceDirectory>${nativeSourceDirectory}</nativeSourceDirectory>
<libDirectory>${project.build.outputDirectory}</libDirectory>
<!-- We use Maven's artifact classifier instead.
Expand Down Expand Up @@ -325,8 +325,8 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Bundle-NativeCode>META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib; osname=MacOSX; processor=aarch64</Bundle-NativeCode>
<Fragment-Host>io.netty.transport-classes-kqueue</Fragment-Host>
<Bundle-NativeCode>META-INF/native/libnetty5_transport_native_kqueue_x86_64.jnilib; osname=MacOSX; processor=x86_64</Bundle-NativeCode>
<Fragment-Host>io.netty5.transport-classes-kqueue</Fragment-Host>
<Automatic-Module-Name>${javaModuleName}</Automatic-Module-Name>
</manifestEntries>
<index>true</index>
Expand Down