This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 3cbd2b1c374 [fix][misc] Rename all shaded Netty native libraries
(#22415)
3cbd2b1c374 is described below
commit 3cbd2b1c374574bbde266bc42f2ab65685f8468d
Author: Lari Hotari <[email protected]>
AuthorDate: Thu Apr 4 01:15:44 2024 -0700
[fix][misc] Rename all shaded Netty native libraries (#22415)
(cherry picked from commit f4235580e6477f0c2f846419866b70c1b057e372)
---
src/rename-netty-native-libs.cmd | 22 +++++++++++++++++++---
src/rename-netty-native-libs.sh | 6 ++++++
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/rename-netty-native-libs.cmd b/src/rename-netty-native-libs.cmd
index 9003f6d0ef4..bfaa16de081 100644
--- a/src/rename-netty-native-libs.cmd
+++ b/src/rename-netty-native-libs.cmd
@@ -42,11 +42,27 @@ call %UNZIP_CMD%
cd /d %TMP_DIR%/%FILE_PREFIX%
:: Loop through the number of groups
-SET Obj_Length=2
+SET Obj_Length=10
SET Obj[0].FROM=libnetty_transport_native_epoll_x86_64.so
SET Obj[0].TO=liborg_apache_pulsar_shade_netty_transport_native_epoll_x86_64.so
-SET Obj[1].FROM=libnetty_tcnative_linux_x86_64.so
-SET Obj[1].TO=liborg_apache_pulsar_shade_netty_tcnative_linux_x86_64.so
+SET Obj[1].FROM=libnetty_transport_native_epoll_aarch_64.so
+SET
Obj[1].TO=liborg_apache_pulsar_shade_netty_transport_native_epoll_aarch_64.so
+SET Obj[2].FROM=libnetty_tcnative_linux_x86_64.so
+SET Obj[2].TO=liborg_apache_pulsar_shade_netty_tcnative_linux_x86_64.so
+SET Obj[3].FROM=libnetty_tcnative_linux_aarch_64.so
+SET Obj[3].TO=liborg_apache_pulsar_shade_netty_tcnative_linux_aarch_64.so
+SET Obj[4].FROM=libnetty_tcnative_osx_x86_64.jnilib
+SET Obj[4].TO=liborg_apache_pulsar_shade_netty_tcnative_osx_x86_64.jnilib
+SET Obj[5].FROM=libnetty_tcnative_osx_aarch_64.jnilib
+SET Obj[5].TO=liborg_apache_pulsar_shade_netty_tcnative_osx_aarch_64.jnilib
+SET Obj[6].FROM=libnetty_transport_native_io_uring_x86_64.so
+SET
Obj[6].TO=liborg_apache_pulsar_shade_netty_transport_native_io_uring_x86_64.so
+SET Obj[7].FROM=libnetty_transport_native_io_uring_aarch_64.so
+SET
Obj[7].TO=liborg_apache_pulsar_shade_netty_transport_native_io_uring_aarch_64.so
+SET Obj[8].FROM=libnetty_resolver_dns_native_macos_aarch_64.jnilib
+SET
Obj[8].TO=liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_aarch_64.jnilib
+SET Obj[9].FROM=libnetty_resolver_dns_native_macos_x86_64.jnilib
+SET
Obj[9].TO=liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_x86_64.jnilib
SET Obj_Index=0
:LoopStart
diff --git a/src/rename-netty-native-libs.sh b/src/rename-netty-native-libs.sh
index 44b971a02c9..ea2a4c0e242 100755
--- a/src/rename-netty-native-libs.sh
+++ b/src/rename-netty-native-libs.sh
@@ -27,7 +27,13 @@ FILE_PREFIX='META-INF/native'
FILES_TO_RENAME=(
'libnetty_transport_native_epoll_x86_64.so
liborg_apache_pulsar_shade_netty_transport_native_epoll_x86_64.so'
+ 'libnetty_transport_native_epoll_aarch_64.so
liborg_apache_pulsar_shade_netty_transport_native_epoll_aarch_64.so'
'libnetty_tcnative_linux_x86_64.so
liborg_apache_pulsar_shade_netty_tcnative_linux_x86_64.so'
+ 'libnetty_tcnative_linux_aarch_64.so
liborg_apache_pulsar_shade_netty_tcnative_linux_aarch_64.so'
+ 'libnetty_tcnative_osx_x86_64.jnilib
liborg_apache_pulsar_shade_netty_tcnative_osx_x86_64.jnilib'
+ 'libnetty_tcnative_osx_aarch_64.jnilib
liborg_apache_pulsar_shade_netty_tcnative_osx_aarch_64.jnilib'
+ 'libnetty_transport_native_io_uring_x86_64.so
liborg_apache_pulsar_shade_netty_transport_native_io_uring_x86_64.so'
+ 'libnetty_transport_native_io_uring_aarch_64.so
liborg_apache_pulsar_shade_netty_transport_native_io_uring_aarch_64.so'
'libnetty_resolver_dns_native_macos_aarch_64.jnilib
liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_aarch_64.jnilib'
'libnetty_resolver_dns_native_macos_x86_64.jnilib
liborg_apache_pulsar_shade_netty_resolver_dns_native_macos_x86_64.jnilib'
)
