Skip to content

Commit

Permalink
Fix native library packaging when cross-compile on m1 for intel (nett…
Browse files Browse the repository at this point in the history
…y#12865) (netty#12866)

Motivation:

We did have a few build configuration problems when cross-compile which resulted in un-usable native libraries.

Modifications:

- Fix native lib naming
- Fix OSGI config

Result:

Correctly generate native libs when cross-compile on m1
  • Loading branch information
normanmaurer authored Oct 5, 2022
1 parent 2ed95c9 commit 4b7546e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions transport-native-kqueue/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
<execution>
<id>build-native-lib</id>
<configuration>
<name>netty_transport_native_kqueue_aarch_64</name>
<name>netty_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,7 +325,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Bundle-NativeCode>META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib; osname=MacOSX; processor=aarch64</Bundle-NativeCode>
<Bundle-NativeCode>META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib; osname=MacOSX; processor=x86_64</Bundle-NativeCode>
<Fragment-Host>io.netty.transport-classes-kqueue</Fragment-Host>
<Automatic-Module-Name>${javaModuleName}</Automatic-Module-Name>
</manifestEntries>
Expand Down

0 comments on commit 4b7546e

Please sign in to comment.