2024-09-03 11:55:00 +00:00
committed by Git OBS Bridge
parent c1e86203fa
commit 413b26cd28
3 changed files with 39 additions and 1 deletions

View File

@@ -0,0 +1,28 @@
--- commons-crypto-1.2.0-src/Makefile.common 2022-12-30 17:12:53.000000000 +0100
+++ commons-crypto-1.2.0-src/Makefile.common 2024-09-03 13:39:35.474008122 +0200
@@ -53,7 +53,7 @@
# os=Default is meant to be generic unix/linux
-known_os_archs := Linux-x86 Linux-x86_64 Linux-aarch64 Linux-arm Linux-armhf Linux-ppc Linux-ppc64 Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc64
+known_os_archs := Linux-x86 Linux-x86_64 Linux-aarch64 Linux-arm Linux-armhf Linux-ppc Linux-ppc64 Linux-riscv64 Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc64
os_arch := $(OS_NAME)-$(OS_ARCH)
ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs)))
@@ -189,6 +189,16 @@
Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-aarch64_COMMONS_CRYPTO_FLAGS :=
+Linux-riscv64_CC := $(CROSS_PREFIX)gcc
+Linux-riscv64_CXX := $(CROSS_PREFIX)g++
+Linux-riscv64_STRIP := $(CROSS_PREFIX)strip
+Linux-riscv64_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -Wall -Werror
+Linux-riscv64_CFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -Wall -Werror
+Linux-riscv64_LINKFLAGS := -shared -static-libgcc
+Linux-riscv64_LIBNAME := libcommons-crypto.so
+Linux-riscv64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
+Linux-riscv64_COMMONS_CRYPTO_FLAGS :=
+
Mac-x86_CC := gcc -arch i386
Mac-x86_CXX := g++ -arch i386
Mac-x86_STRIP := strip -x

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 3 11:54:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* apache-commons-crypto-riscv64.patch
+ fix native build on riscv64 architecture
-------------------------------------------------------------------
Fri Jan 27 22:20:13 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>

View File

@@ -26,6 +26,7 @@ License: Apache-2.0
Group: Development/Libraries/Java
URL: https://commons.apache.org/proper/%{short_name}
Source0: https://dlcdn.apache.org/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: %{name}-riscv64.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: maven-local
@@ -53,7 +54,9 @@ BuildArch: noarch
API documentation for %{name}.
%prep
%autosetup -n %{short_name}-%{version}-src
%autosetup -n %{short_name}-%{version}-src -p1
#the above empty line is necessary for sle12sp5
%pom_remove_plugin org.jacoco:jacoco-maven-plugin
%pom_remove_plugin com.github.spotbugs:spotbugs-maven-plugin
%{mvn_file} : %{name}