rpm/julia
SHA256
1
0
Fork 0
forked from pool/julia
Code Pull Requests Activity

Accepting request 1177652 from home:uncomfyhalomacro:branches:science

Browse Source 
- Update JULIA_CPU_TARGETS
- Reenable aarch64 builds with patch
  ./allow_libssp_libatomic_and_libgomp_to_fail_as_they_are_not_available_on_all_systems.patch

OBS-URL: https://build.opensuse.org/request/show/1177652
OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=211
This commit is contained in:
Soc Virnyl Estela 2024-05-30 01:07:42 +00:00 committed by Git OBS Bridge
parent 622039eb91
commit 60842d7b09
3 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
allow_libssp_libatomic_and_libgomp_to_fail_as_they_are_not_available_on_all_systems.patch Normal file
View File

@ -0,0 +1,30 @@
From dc7e47be092a21ddd74311114b2df4c72a8044b3 Mon Sep 17 00:00:00 2001
From: "Viral B. Shah" <ViralBShah@users.noreply.github.com>
Date: Tue, 28 May 2024 16:37:02 -0400
Subject: [PATCH] Allow libssp, libatomic and libgomp to fail as they are not
available on all systems
Co-authored-by: FX Coudert <fxcoudert@gmail.com>
---
base/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/base/Makefile b/base/Makefile
index 9a6c0d0d03833..febee53a9ddfc 100644
--- a/base/Makefile
+++ b/base/Makefile
@@ -249,12 +249,12 @@ endif
ifneq (,$(LIBGFORTRAN_VERSION))
$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
endif
-$(eval $(call symlink_system_library,CSL,libquadmath,0))
$(eval $(call symlink_system_library,CSL,libstdc++,6))
-# We allow libssp, libatomic and libgomp to fail as they are not available on all systems
+# We allow libssp, libatomic, libgomp and libquadmath to fail as they are not available on all systems
$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE))
$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE))
$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE))
+$(eval $(call symlink_system_library,CSL,libquadmath,0,ALLOW_FAILURE))
$(eval $(call symlink_system_library,PCRE,libpcre2-8))
$(eval $(call symlink_system_library,DSFMT,libdSFMT))
$(eval $(call symlink_system_library,LIBBLASTRAMPOLINE,libblastrampoline))

11
julia.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed May 29 13:42:29 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- Update JULIA_CPU_TARGETS
-------------------------------------------------------------------
Wed May 29 03:29:01 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- Reenable aarch64 builds with patch
./allow_libssp_libatomic_and_libgomp_to_fail_as_they_are_not_available_on_all_systems.patch
-------------------------------------------------------------------
Wed May 22 00:19:35 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>

14
julia.spec
View File

@ -84,6 +84,8 @@ Patch6: openlibm.patch
Patch7: julia-hardcoded-libs.patch
# PATCH-FIX-OPENSUSE -- A bug in MPFR which they describe in their INSTALL file. So we have to assist the mpfr.mk that julia uses.
Patch8: mpfr-looking-for-gmp-fix.patch
# PATCH-FIX-UPSTREAM
Patch9: https://github.com/JuliaLang/julia/pull/54605.patch#/allow_libssp_libatomic_and_libgomp_to_fail_as_they_are_not_available_on_all_systems.patch
BuildRequires: ImageMagick
BuildRequires: autoconf
@ -269,7 +271,7 @@ Obsoletes: %{name} < %{version}
%if 0%{?compat_mode}
ExclusiveArch: x86_64 x86_64_v3
%else
ExclusiveArch: x86_64 x86_64_v3
ExclusiveArch: x86_64 x86_64_v3 aarch64
%endif
%{?suse_build_hwcaps_libs}
@ -377,7 +379,10 @@ RELEASE_BANNER="openSUSE Leap ${SLE_VERSION} - Built on $(date -u)"
make %{?_smp_mflags} \
MARCH="%{julia_march}" \
%ifarch x86_64 || x86_64_v3
JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" \
JULIA_CPU_TARGETS="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" \
%endif
%ifarch aarch64
JULIA_CPU_TARGETS="generic;cortex-a53;cortex-a55;cortex-a57;cortex-a72;arm_cortex_a78;arm_cortex_x1;neoverse-512tvb,base(3);arm_neoverse_n1;arm_neoverse_v1;arm_neoverse_n2;carmel,clone_all;apple-m1,base(3)" \
%endif
build_prefix="%{_builddir}/%{buildsubdir}/build%{_prefix}" \
build_libdir="%{_builddir}/%{buildsubdir}/build%{_libdir}" \
@ -437,7 +442,10 @@ RELEASE_BANNER="openSUSE Leap ${SLE_VERSION} - Built on $(date -u)"
make install DESTDIR="%{buildroot}" \
MARCH="%{julia_march}" \
%ifarch x86_64 || x86_64_v3
JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" \
JULIA_CPU_TARGETS="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" \
%endif
%ifarch aarch64
JULIA_CPU_TARGETS="generic;cortex-a53;cortex-a55;cortex-a57;cortex-a72;arm_cortex_a78;arm_cortex_x1;neoverse-512tvb,base(3);arm_neoverse_n1;arm_neoverse_v1;arm_neoverse_n2;carmel,clone_all;apple-m1,base(3)" \
%endif
build_prefix="%{_builddir}/%{buildsubdir}/build%{_prefix}" \
build_libdir="%{_builddir}/%{buildsubdir}/build%{_libdir}" \