#99 Maintain versionned link to llvm-config
Merged a year ago by sergesanspaille. Opened a year ago by sergesanspaille.
rpms/ sergesanspaille/llvm rawhide  into  rawhide

file modified
+21 -1
@@ -48,7 +48,7 @@ 

  

  Name:		%{pkg_name}

  Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}

- Release:	2%{?dist}

+ Release:	3%{?dist}

  Summary:	The Low Level Virtual Machine

  

  License:	NCSA
@@ -368,6 +368,13 @@ 

  %if %{without compat_build}

  

  mv %{buildroot}/%{pkg_bindir}/llvm-config %{buildroot}/%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}

+ # We still maintain a versionned symlink for consistency across llvm versions.

+ # This is specific to the non-compat build and matches the exec prefix for

+ # compat builds. An isa-agnostic versionned symlink is also maintained in the (un)install

+ # steps.

+ (cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config-%{maj_ver}-%{__isa_bits} )

+ # ghost presence

+ touch %{buildroot}%{_bindir}/llvm-config-%{maj_ver}

  

  %else

  
@@ -397,10 +404,16 @@ 

  

  %post devel

  %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}

+ %if %{without compat_build}

+ %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}

+ %endif

  

  %postun devel

  if [ $1 -eq 0 ]; then

    %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}

+ %if %{without compat_build}

+   %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}

+ %endif

  fi

  

  %files
@@ -413,6 +426,8 @@ 

  %exclude %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}

  

  %if %{without compat_build}

+ %exclude %{_bindir}/llvm-config-%{maj_ver}

+ %exclude %{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}

  %exclude %{_bindir}/not

  %exclude %{_bindir}/count

  %exclude %{_bindir}/yaml-bench
@@ -457,6 +472,8 @@ 

  %{_includedir}/llvm-c

  %{_libdir}/libLLVM.so

  %{_libdir}/cmake/llvm

+ %{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}

+ %ghost %{_bindir}/llvm-config-%{maj_ver}

  %else

  %{install_includedir}/llvm

  %{install_includedir}/llvm-c
@@ -499,6 +516,9 @@ 

  %endif

  

  %changelog

+ * Thu Jul 22 2021 sguelton@redhat.com - 12.0.1-3

+ - Maintain versionned link to llvm-config

+ 

  * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.1-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

file modified
+4
@@ -47,4 +47,8 @@ 

        - llvm-config:

            dir: ./

            run: llvm-config --version

+       # make sure versionned llvm-config symlink is properly setup

+       - versionned-llvm-config:

+           dir: ./

+           run: llvm-config-12 --version

        - integration-test-suite

no initial comment

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

rebased onto 42d44b175a8a12ea0c028155dd46e41015083423

a year ago

rebased onto d0d382d0955246c4f9416a0c2d8048446454de7a

a year ago

I think you forgot to uncomment this.

rebased onto afb9f30b0fbbf7bbb44bb9db3b9d164c22765b48

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 723fa2b625469cd0c3f183de114f20e992c5cdbb

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 03f438b476bcd87c1e9df9f525af6f46ea5e0e58

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto c8f4a34166b8e0d9fe3728302847e4021a66d82e

a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 1e57ef5d856c4a193167aca7a5c8b00d9f6ebc4a

a year ago

rebased onto 6058ccfb24faa7206cd39932f56fdb383a5537e6

a year ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

rebased onto dbd3134

a year ago

Build succeeded.

Pull-Request has been merged by sergesanspaille

a year ago
Metadata