diff --git a/SPECS/lld.spec b/SPECS/lld.spec index c783e72..583f8a6 100644 --- a/SPECS/lld.spec +++ b/SPECS/lld.spec @@ -2,7 +2,7 @@ #global rc_ver 4 %global lld_srcdir lld-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src -%global baserelease 1 +%global baserelease 2 %global maj_ver 13 %global min_ver 0 %global patch_ver 0 @@ -76,16 +76,6 @@ Summary: LLD shared libraries %description libs Shared libraries for LLD. -%package test -Summary: LLD regression tests -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3-lit -Requires: llvm-test(major) = %{maj_ver} -Requires: lld-libs = %{version}-%{release} - -%description test -LLVM regression tests. - %prep %autosetup -n %{lld_srcdir} -p2 @@ -117,46 +107,7 @@ cd %{_vpath_builddir} %cmake_build -# Build the unittests so we can install them. -%cmake_build --target lld-test-depends - %install - -%global lit_cfg test/%{_arch}.site.cfg.py -%global lit_unit_cfg test/Unit/%{_arch}.site.cfg.py -%global lit_lld_test_cfg_install_path %{_datadir}/lld/lit.lld-test.cfg.py - -# Generate lit config files. Strip off the last line that initiates the -# test run, so we can customize the configuration. -head -n -1 %{_target_platform}/test/lit.site.cfg.py >> %{lit_cfg} -head -n -1 %{_target_platform}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg} - -# Patch lit config files to load custom config: -for f in %{lit_cfg} %{lit_unit_cfg}; do - echo "lit_config.load_config(config, '%{lit_lld_test_cfg_install_path}')" >> $f -done - -# Install test files -install -d %{buildroot}%{_datadir}/lld/src -cp %{SOURCE4} %{buildroot}%{_datadir}/lld/ - -# The various tar options are there to make sur the archive is the same on 32 and 64 bit arch, i.e. -# the archive creation is reproducible. Move arch-specific content out of the tarball -mv %{lit_cfg} %{buildroot}%{_datadir}/lld/src/%{_arch}.site.cfg.py -mv %{lit_unit_cfg} %{buildroot}%{_datadir}/lld/src/%{_arch}.Unit.site.cfg.py -tar --sort=name --mtime='UTC 2020-01-01' -c test/ | gzip -n > %{buildroot}%{_datadir}/lld/src/test.tar.gz - -install -d %{buildroot}%{_libexecdir}/tests/lld -install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/lld - -# Install unit test binaries -install -d %{buildroot}%{_libdir}/lld/ -cp -R %{_target_platform}/unittests %{buildroot}%{_libdir}/lld/ -rm -rf `find %{buildroot}%{_libdir}/lld/ -iname '*make*'` - -# Install gtest libraries -cp %{_target_platform}/%{_lib}/libgtest*so* %{buildroot}%{_libdir}/lld/ - # Install libraries and binaries cd %{_target_platform} @@ -209,15 +160,10 @@ cd %{_vpath_builddir} %files libs %{_libdir}/liblld*.so.* -%files test -%{_libexecdir}/tests/lld/ -%{_libdir}/lld/ -%{_datadir}/lld/src/test.tar.gz -%{_datadir}/lld/src/%{_arch}.site.cfg.py -%{_datadir}/lld/src/%{_arch}.Unit.site.cfg.py -%{_datadir}/lld/lit.lld-test.cfg.py - %changelog +* Thu Dec 09 2021 Tom Stellard - 13.0.0-2 +- Drop lld-test package + * Fri Oct 15 2021 Tom Stellard - 13.0.0-1 - 13.0.0 Release