From c67addc368ab4f96557372d0ea3c52a112e2a70746b9292d01cd76ac6e4ac5b5 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 11 Dec 2023 06:39:56 +0000 Subject: [PATCH] - DO NOT USE SYSTEM BLAS. There will be an SR if need be to openSUSE Blas to allow INTERFACE64. For now we just use the bundled blas packages. We also use bundled lapack as well ;) OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=121 --- julia.changes | 6 ++++-- julia.spec | 19 ++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/julia.changes b/julia.changes index aa86285..0db3be7 100644 --- a/julia.changes +++ b/julia.changes @@ -1,10 +1,12 @@ ------------------------------------------------------------------- -Mon Dec 11 04:35:23 UTC 2023 - Soc Virnyl Estela +Mon Dec 11 06:37:37 UTC 2023 - Soc Virnyl Estela - Attempt fix when libLLVM-14jl is missing by moving build directory contents correctly. - Allow linking of openblas properly. -- Create fakename of libopenblas.so.0 and symlink it to julia's set of sofiles - Just fdupes starting from the top buildroot directory +- DO NOT USE SYSTEM BLAS. There will be an SR if need be to openSUSE Blas to + allow INTERFACE64. For now we just use the bundled blas packages. + We also use bundled lapack as well ;) ------------------------------------------------------------------- Sun Dec 10 14:59:09 UTC 2023 - Soc Virnyl Estela diff --git a/julia.spec b/julia.spec index 19baf61..532c500 100644 --- a/julia.spec +++ b/julia.spec @@ -254,8 +254,8 @@ export LDFLAGS="$LDFLAGS -latomic" # We need these compilation flags to avoid error when building MBEDTLS with # GCC-11. # Ref.: https://build.opensuse.org/package/show/security:tls/mbedtls -export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized $(pkg-config --cflags --libs openblas)" -export CXXFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized $(pkg-config --cflags --libs openblas)" +export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" +export CXXFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" export LD_LIBRARY_PATH=%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir} make %{?_smp_mflags} \ @@ -282,8 +282,7 @@ make %{?_smp_mflags} \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_BLAS=1 \ - OPENBLAS_LIBNAMESUFFIX= \ - USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_LAPACK=0 \ USE_SYSTEM_LIBBLASTRAMPOLINE=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_MPFR=1 \ @@ -327,8 +326,8 @@ fi # We need these compilation flags to avoid error when building MBEDTLS with # GCC-11. # Ref.: https://build.opensuse.org/package/show/security:tls/mbedtls -export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized $(pkg-config --cflags --libs openblas)" -export CXXFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized $(pkg-config --cflags --libs openblas)" +export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" +export CXXFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" export LD_LIBRARY_PATH=%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir} make install DESTDIR=%{buildroot} \ @@ -354,9 +353,8 @@ make install DESTDIR=%{buildroot} \ USE_SYSTEM_LLD=1 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_BLAS=1 \ - OPENBLAS_LIBNAMESUFFIX= \ - USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_BLAS=0 \ + USE_SYSTEM_LAPACK=0 \ USE_SYSTEM_LIBBLASTRAMPOLINE=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_MPFR=1 \ @@ -375,7 +373,7 @@ make install DESTDIR=%{buildroot} \ USE_SYSTEM_ZLIB=1 \ USE_SYSTEM_P7ZIP=1 \ USE_SYSTEM_OPENLIBM=1 \ - USE_BLAS64=0 \ + USE_BLAS64=1 \ LIBBLAS=-lblas \ LIBBLASNAME=libblas \ LIBLAPACK=-llapack \ @@ -400,7 +398,6 @@ mv -f %{buildroot}%{_datadir}/doc/julia/* %{buildroot}%{_docdir}/julia/ rm -r %{buildroot}%{_datadir}/doc/julia ln -sfv /var/lib/ca-certificates/ca-bundle.pem %{buildroot}%{_datadir}/julia/cert.pem # Needed by some julia packages -ln -sfv %{_libdir}/libopenblas.so.0 %{buildroot}%{_libdir}/julia/libopenblas64_.so # Ironic that we don't need INTERFACE64 :) # Remove execution permission on documentation files. chmod -x+X -R %{buildroot}%{_docdir}/julia/*