[PR PATCH] remove cc alternative group

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

There is a new pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages cc
https://github.com/void-linux/void-packages/pull/15968

remove cc alternative group
The alternative group for cc keeps causing problems, mostly with dkms.
I think the benefit of keeping it isn't worth the trouble it causes.

A patch file from https://github.com/void-linux/void-packages/pull/15968.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cc-15968.patch --]
[-- Type: text/x-diff, Size: 2120 bytes --]

From f2580bcfde7a69032b0f57294bee3ec3a247285d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 30 Oct 2019 21:23:37 +0100
Subject: [PATCH 1/2] gcc: remove cc alternative group, link /usr/bin/cc to
 /usr/bin/gcc

this reverts b9daff32a558ac79e423dd45c82383678cb9960a
---
 srcpkgs/gcc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 6774b8a5826..3a4f0c4da22 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=1
+revision=2
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -30,7 +30,6 @@ nopie=yes
 lib32disabled=yes
 bootstrap=yes
 replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
-alternatives="cc:cc:/usr/bin/gcc"
 
 _have_gccgo=yes
 
@@ -364,6 +363,8 @@ do_install() {
 	ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \
 		${DESTDIR}/usr/include/c++/${version}
 
+	# cc symlink
+	ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
 	# rpcgen wants /lib/cpp, make a symlink
 	ln -sfr ${DESTDIR}/usr/bin/cpp ${DESTDIR}/usr/lib/cpp
 

From 2313a0934a3118bb84fddd07177ab27452ca4623 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 30 Oct 2019 21:24:46 +0100
Subject: [PATCH 2/2] llvm9: remove cc alternative group

[ci skip]
---
 srcpkgs/llvm9/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/llvm9/template b/srcpkgs/llvm9/template
index 3c1a1a3451b..1eb138e1b63 100644
--- a/srcpkgs/llvm9/template
+++ b/srcpkgs/llvm9/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm9'
 pkgname=llvm9
 version=9.0.0
-revision=2
+revision=3
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -216,7 +216,6 @@ clang_package() {
 		*) depends+=" glibc-devel";;
 	esac
 	short_desc+=" - C language family frontend"
-	alternatives="cc:cc:/usr/bin/clang"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
 		vmove usr/include/clang