From f45eb063f30a6f3d3c85a0ae94804cc92cb9e1727b667a13f7520d6fe2c9df0c Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 12 Dec 2023 14:30:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=135 --- julia.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/julia.spec b/julia.spec index b7cf7ab..134c765 100644 --- a/julia.spec +++ b/julia.spec @@ -257,12 +257,13 @@ export CXXFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized" export LD_LIBRARY_PATH=%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir}:%{_builddir}/%{buildsubdir}/usr/lib pushd deps + export BUILDDIR="%{_builddir}/%{buildsubdir}/build" export USE_BLAS64=1 export USE_BINARYBUILDER_OPENBLAS=0 export OPENBLAS_LIBNAMESUFFIX="%{?__isa_bits}_" export OPENBLAS_SYMBOLSUFFIX="%{?__isa_bits}_" export OPENBLAS_CFLAGS="%{optflags}" - make install-openblas + make prefix=%{prefix} libdir=%{_libdir} bindir=%{_bindir} install-openblas popd make %{?_smp_mflags} \ @@ -288,7 +289,7 @@ make %{?_smp_mflags} \ USE_SYSTEM_LLD=1 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_BLAS=0 \ USE_SYSTEM_LAPACK=0 \ USE_SYSTEM_LIBBLASTRAMPOLINE=1 \ USE_SYSTEM_GMP=1 \ @@ -316,24 +317,10 @@ make %{?_smp_mflags} \ # This may fix other issues where libLLVM-14jl.so is not properly copied? if [ "x%{_lib}" != xlib ] ; then - # The one that contains buildsubdir/build is from the build_prefix and build_libdir vars - if [ -d "%{_builddir}/%{buildsubdir}/usr/lib" ] ; then - cp -a %{_builddir}/%{buildsubdir}/usr/lib/* %{_builddir}/%{buildsubdir}/build/%{_libdir} - fi - if [ -d "%{_builddir}/%{buildsubdir}/%{_libdir}" ] ; then - cp -a %{_builddir}/%{buildsubdir}/%{_libdir}/* %{_builddir}/%{buildsubdir}/build/%{_libdir} - fi cp -a %{_builddir}/%{buildsubdir}/build/usr/lib/* %{_builddir}/%{buildsubdir}/build/%{_libdir} rm -rf %{_builddir}/%{buildsubdir}/build/usr/lib/ - # make -C deps install-somepackage goes to top-level folder -else - # Since it's not there so we also just copy it anyway - cp -a %{_builddir}/%{buildsubdir}/usr/lib/* %{_builddir}/%{buildsubdir}/build/%{_libdir} fi -# Just delete it after -rm -rf %{_builddir}/%{buildsubdir}/usr/ - %check # The tests will only pass if openblas is being used. # make %{?_smp_mflags} test @@ -369,7 +356,7 @@ make install DESTDIR=%{buildroot} \ USE_SYSTEM_LLD=1 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_BLAS=0 \ USE_SYSTEM_LAPACK=0 \ USE_SYSTEM_LIBBLASTRAMPOLINE=1 \ USE_SYSTEM_GMP=1 \