From 31df515f6b44880ac6213f30ac51275a4a259444 Mon Sep 17 00:00:00 2001 From: Jonathan Lennox Date: Mon, 1 Apr 2024 19:19:40 +0000 Subject: [PATCH 1/2] Name ppc64le directory in the form expected by JNA. --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e16c9c7..71bded8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,13 @@ endif () if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") - set(JITSI_SYSTEM_PROCESSOR "x86-64") + set(JNA_SYSTEM_PROCESSOR "x86-64") + elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64el") + set(JNA_SYSTEM_PROCESSOR "ppc64le") else () - set(JITSI_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) + set(JNA_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) endif () - set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}/src/main/resources/${CMAKE_SYSTEM_NAME}-${JITSI_SYSTEM_PROCESSOR}" CACHE PATH "default install path" FORCE) + set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}/src/main/resources/${CMAKE_SYSTEM_NAME}-${JNA_SYSTEM_PROCESSOR}" CACHE PATH "default install path" FORCE) string(TOLOWER ${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX) message(STATUS "CMAKE_INSTALL_PREFIX not set, defaulting to >${CMAKE_INSTALL_PREFIX}<") endif () From efa0af1cfa6b34e0c82e12d01b7c3b0148096d83 Mon Sep 17 00:00:00 2001 From: Jonathan Lennox Date: Mon, 1 Apr 2024 19:26:10 +0000 Subject: [PATCH 2/2] Fix path for maven-bundle-plugin. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 42cf258..b39776e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,8 +70,8 @@ linux-x86-64/libjitsisrtp_3.so;osname=Linux;processor=x86-64, linux-aarch64/libjitsisrtp_1.1.so; linux-aarch64/libjitsisrtp_3.so;osname=Linux;processor=AArch64, - linux-ppc64el/libjitsisrtp_1.1.so; - linux-ppc64el/libjitsisrtp_3.so;osname=Linux;processor=PowerPC-64-LE, + linux-ppc64le/libjitsisrtp_1.1.so; + linux-ppc64le/libjitsisrtp_3.so;osname=Linux;processor=PowerPC-64-LE, darwin-x86-64/libjitsisrtp_1.1.dylib; darwin-x86-64/libjitsisrtp_3.dylib;osname=Mac OS X;processor=x86-64, darwin-aarch64/libjitsisrtp_1.1.dylib;