pool/protobuf
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

little fixes around architecture

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=186
This commit is contained in:
Dirk Mueller 2024-10-24 07:55:58 +00:00 committed by Git OBS Bridge
parent 8b6bd032ec
commit 702153286c
4 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
protobuf-java.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 23 08:44:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Java: fix generating proper maven descriptor for protoc on aarch64
- Java: rename global variable buildarch -> protoc_arch to avoid
name clash on sle15
-------------------------------------------------------------------
Mon Oct 21 20:55:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>

32
protobuf-java.spec
View File

@ -19,44 +19,44 @@
%define tarname protobuf
%define baseversion 28.2
%global buildarch %{_arch}
%ifarch x86_64
%global buildarch x86_64
%global protoc_arch %{_arch}
%ifarch x86_64 %{?x86_64}
%global protoc_arch x86_64
%endif
%ifarch ppc
%global buildarch ppc_32
%global protoc_arch ppc_32
%endif
%ifarch ppc64
%global buildarch ppc_64
%global protoc_arch ppc_64
%endif
%ifarch ppc64le
%global buildarch ppcle_64
%global protoc_arch ppcle_64
%endif
%ifarch %{ix86}
%global buildarch x86_32
%global protoc_arch x86_32
%endif
%ifarch ia64
%global buildarch itanium_64
%global protoc_arch itanium_64
%endif
%ifarch s390
%global buildarch s390_32
%global protoc_arch s390_32
%endif
%ifarch s390x
%global buildarch s390_64
%global protoc_arch s390_64
%endif
%ifarch %{arm}
%global buildarch arm_32
%global protoc_arch arm_32
%endif
%ifarch %{aarch64}
%global buildarch aarch_64
%ifarch aarch64 %{arm64}
%global protoc_arch aarch_64
%endif
# 32 bit sparc, optimized for v9
%ifarch sparcv9
%global buildarch sparc_32
%global protoc_arch sparc_32
%endif
# 64 bit sparc
%ifarch sparc64
%global buildarch sparc_64
%global protoc_arch sparc_64
%endif
Name: protobuf-java
Version: 4.%{baseversion}
@ -344,7 +344,7 @@ cat <<__PROTOBUF__ >>%{buildroot}%{_datadir}/maven-metadata/%{name}-protoc.xml
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<extension>exe</extension>
<classifier>linux-%{buildarch}</classifier>
<classifier>linux-%{protoc_arch}</classifier>
<version>%{version}</version>
<path>$(type -p protoc)</path>
</artifact>

7
protobuf.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 23 08:44:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Java: fix generating proper maven descriptor for protoc on aarch64
- Java: rename global variable buildarch -> protoc_arch to avoid
name clash on sle15
-------------------------------------------------------------------
Mon Oct 21 20:55:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>

7
python-protobuf.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 23 08:44:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Java: fix generating proper maven descriptor for protoc on aarch64
- Java: rename global variable buildarch -> protoc_arch to avoid
name clash on sle15
-------------------------------------------------------------------
Mon Oct 21 20:55:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>