开源软件构建与测试

_service:obs_scm:llvm.spec Changed

@@ -1,21 +1,27 @@
+%bcond_without sys_llvm
 %bcond_without check
 
-%global maj_ver 12
+%global maj_ver 15
 %global min_ver 0
-%global patch_ver 1
+%global patch_ver 7
 
+%if %{with sys_llvm}
+%global pkg_name llvm
+%global install_prefix %{_prefix}
+%else
 %global pkg_name llvm%{maj_ver}
-%global bin_suffix -%{maj_ver}
 %global install_prefix %{_libdir}/%{name}
+%endif
+
 %global install_bindir %{install_prefix}/bin
 %global install_includedir %{install_prefix}/include
+%if 0%{?__isa_bits} == 64
+%global install_libdir %{install_prefix}/lib64
+%else
 %global install_libdir %{install_prefix}/lib
+%endif
 %global install_srcdir %{install_prefix}/src
-
-%global pkg_bindir %{install_bindir}
-%global pkg_includedir %{_includedir}/%{name}
-%global pkg_libdir %{install_libdir}
-%global pkg_srcdir %{install_srcdir}
+%global install_docdir %{install_prefix}/share/doc
 
 %global max_link_jobs %{_smp_build_ncpus}
 %global targets_to_build "all"
@@ -24,15 +30,18 @@
 %global build_install_prefix %{buildroot}%{install_prefix}
 %global llvm_triple %{_host}
 
+# Disable LTO as this causes crash if gcc lto enabled.
+%define _lto_cflags %{nil}
+
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	1
+Release:	3
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
 URL:		http://llvm.org
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/llvm-%{version}.src.tar.xz
-#Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/cmake-%{version}.src.tar.xz
+Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/cmake-%{version}.src.tar.xz
 
 BuildRequires:	binutils-devel
 BuildRequires:	cmake
@@ -106,7 +115,6 @@
  
 Provides:	llvm-test(major) = %{maj_ver}
 
-%if %{with check}
 %description test
 LLVM regression tests.
  
@@ -115,12 +123,11 @@
  
 %description googletest
 LLVM's modified googletest sources.
-%endif
 
 %prep
-#%setup -T -q -b 1 -n cmake-%{version}.src
-#cd ..
-#mv cmake-%{version}.src cmake
+%setup -T -q -b 1 -n cmake-%{version}.src
+cd ..
+mv cmake-%{version}.src cmake
 %autosetup -n llvm-%{version}.src
 
 pathfix.py -i %{__python3} -pn \
@@ -135,7 +142,7 @@
 %cmake	.. -G Ninja \
 	-DBUILD_SHARED_LIBS:BOOL=OFF \
 	-DLLVM_PARALLEL_LINK_JOBS=%{max_link_jobs} \
-	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \
 	-DLLVM_ENABLE_LIBCXX:BOOL=OFF \
@@ -166,8 +173,13 @@
 	-DLLVM_DEFAULT_TARGET_TRIPLE=%{llvm_triple} \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
-	-DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \
+	-DLLVM_INSTALL_SPHINX_HTML_DIR=%{install_docdir}/html \
 	-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 \
+%if 0%{?__isa_bits} == 64
+	-DLLVM_LIBDIR_SUFFIX=64 \
+%else
+	-DLLVM_LIBDIR_SUFFIX= \
+%endif
 	-DLLVM_INCLUDE_BENCHMARKS=OFF
 
 %ninja_build LLVM
@@ -178,17 +190,17 @@
 
 mkdir -p %{buildroot}/%{_bindir}
 
-%if %{with check}
-# -----------------------------------------------------------------------------------------------------
 # Install binaries needed for lit tests
-%global test_binaries llvm-isel-fuzzer llvm-opt-fuzzer
- 
-for f in %{test_binaries}
+for f in llvm-isel-fuzzer llvm-opt-fuzzer
 do
    install -m 0755 %{_builddir}/llvm-%{version}.src/_build/bin/$f %{buildroot}%{install_bindir}
 done
- 
+
+%if 0%{?__isa_bits} == 64
+install %{_builddir}/llvm-%{version}.src/_build/lib64/libLLVMTestingSupport.a %{buildroot}%{install_libdir}
+%else
 install %{_builddir}/llvm-%{version}.src/_build/lib/libLLVMTestingSupport.a %{buildroot}%{install_libdir}
+%endif
 
 # Install gtest sources so clang can use them for gtest
 install -d %{buildroot}%{install_srcdir}
@@ -198,19 +210,11 @@
 # Clang needs these for running lit tests.
 cp %{_builddir}/llvm-%{version}.src/utils/update_cc_test_checks.py %{buildroot}%{install_srcdir}/utils/
 cp -R %{_builddir}/llvm-%{version}.src/utils/UpdateTestChecks %{buildroot}%{install_srcdir}/utils/
-# -----------------------------------------------------------------------------------------------------
-%endif
-
-# Add version suffix to binaries
-for f in %{buildroot}/%{install_bindir}/*; do
-  filename=`basename $f`
-  ln -s ../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{bin_suffix}
-done
 
 # Move header files
-mkdir -p %{buildroot}/%{pkg_includedir}
-ln -s ../../../%{install_includedir}/llvm %{buildroot}/%{pkg_includedir}/llvm
-ln -s ../../../%{install_includedir}/llvm-c %{buildroot}/%{pkg_includedir}/llvm-c
+mkdir -p %{buildroot}/%{install_includedir}
+ln -s ../../../%{install_includedir}/llvm %{buildroot}/%{install_includedir}/llvm
+ln -s ../../../%{install_includedir}/llvm-c %{buildroot}/%{install_includedir}/llvm-c
 
 # Fix multi-lib
 %multilib_fix_c_header --file %{install_includedir}/llvm/Config/llvm-config.h
@@ -218,116 +222,86 @@
 # Create ld.so.conf.d entry
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
 cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
-%{pkg_libdir}
+%{install_libdir}
 EOF
 
-mkdir -p %{buildroot}/%{_mandir}/man1
-for f in %{build_install_prefix}/share/man/man1/*; do
-  filename=`basename $f | cut -f 1 -d '.'`
-  mv $f %{buildroot}%{_mandir}/man1/$filename%{bin_suffix}.1
-done
-
 # Remove opt-viewer, since this is just a compatibility package.
 rm -Rf %{build_install_prefix}/share/opt-viewer
 
-rm %{buildroot}%{_bindir}/llvm-config%{bin_suffix}
-(cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config llvm-config%{bin_suffix}-%{__isa_bits} )
-
-touch %{buildroot}%{_bindir}/llvm-config%{bin_suffix}
-
-#cp -Rv ../cmake/Modules/* %{buildroot}%{pkg_libdir}/cmake/llvm
+cp -Rv ../cmake/Modules/* %{buildroot}%{install_libdir}/cmake/llvm
 
 %check
 %if %{with check}
-LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir}  %{__ninja} check-all -C ./_build/
+LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C ./_build/
 %endif
 
 %ldconfig_scriptlets libs
 
-%post devel
-%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{bin_suffix} llvm-config%{bin_suffix} %{pkg_bindir}/llvm-config%{bin_suffix}-%{__isa_bits} %{__isa_bits}
-
-%postun devel
-if  $1 -eq 0 ; then
-  %{_sbindir}/update-alternatives --remove llvm-config%{bin_suffix} %{pkg_bindir}/llvm-config%{bin_suffix}-%{__isa_bits}
-fi
-
 %files
 %license LICENSE.TXT
-%exclude %{_mandir}/man1/llvm-config*
-%{_mandir}/man1/*
-%{_bindir}/*
-%exclude %{_bindir}/llvm-config%{bin_suffix}
-%exclude %{pkg_bindir}/llvm-config%{bin_suffix}-%{__isa_bits}

_service Changed

_service:obs_scm:README.md Changed

_service:obs_scm:cmake-15.0.7.src.tar.xz Added

_service:obs_scm:llvm-12.0.1.src.tar.xz Deleted

_service:obs_scm:llvm-14-1680771914.d2b7f71.obscpio Deleted

_service:obs_scm:llvm-15-1689126156.dc66ff2.obscpio Added

_service:obs_scm:llvm-15.0.7.src.tar.xz Added

_service:obs_scm:llvm-14.obsinfo -> _service:obs_scm:llvm-15.obsinfo Changed

Changes of Revision 2