Fix depends/provides/conflicts

Signed-off-by: Peter Jung <admin@ptr1337.dev>

2 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa61575b2dd3..1c25ace21658 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,7 +27,6 @@ pkgbase = gcc-git
 	makedepends = zstd
 	options = !emptydirs
 	options = !lto
-	options = !debug
 	source = git://gcc.gnu.org/git/gcc.git
 	source = c89
 	source = c99
@@ -53,7 +52,6 @@ pkgname = gcc-git
 	replaces = gcc-multilib-git
 	options = !emptydirs
 	options = staticlibs
-	options = debug
 
 pkgname = gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC (git version)
@@ -71,7 +69,7 @@ pkgname = gcc-libs-git
 	provides = libgphobos.so
 	conflicts = gcc-libs
 	replaces = gcc-multilib-git
-	replaces = libgphobos
+	replaces = libgphobos-git
 	options = !emptydirs
 	options = !strip
 
@@ -131,15 +129,12 @@ pkgname = gcc-ada-git
 pkgname = gcc-d-git
 	pkgdesc = D frontend for GCC (git version)
 	depends = gcc-git=13.0.0_r197401.g33be3ee36a7-1
-	depends = libisl.so
-	provides = gdc
 	provides = gcc-d
-	provides = gcc-d-git
+	provides = gdc
+	provides = gdc-git
 	conflicts = gcc-d
-	replaces = gdc
-	replaces = gcc-d
+	replaces = gdc-git
 	options = staticlibs
-	options = !debug
 
 pkgname = lto-dump-git
 	pkgdesc = Dump link time optimization object files (git version)
@@ -148,7 +143,6 @@ pkgname = lto-dump-git
 	provides = lto-dump
 	provides = lto-dump-git
 	conflicts = lto-dump
-	replaces = lto-dump
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC (git version)
@@ -166,3 +160,6 @@ pkgname = libgccjit-git
 	pkgdesc = Just-In-Time Compilation with GCC backend (git version)
 	depends = gcc-git=13.0.0_r197401.g33be3ee36a7-1
 	depends = libisl.so
+	provides = libgccjit
+	provides = libgccjit-git
+	conflicts = libgccjit
diff --git a/PKGBUILD b/PKGBUILD
index f88ea367b746..cdb29f01994b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,7 +38,7 @@ checkdepends=(
   python-pytest
   tcl
 )
-options=(!emptydirs !lto !debug)
+options=(!emptydirs !lto)
 _libdir=usr/lib/gcc/$CHOST/${pkgver%_*}
 source=(git://gcc.gnu.org/git/gcc.git
   c89 c99
@@ -163,7 +163,7 @@ package_gcc-libs-git() {
   provides=("gcc-libs-git=$pkgver-$pkgrel" gcc-libs gcc-multilib{,-git} libgo.so libgfortran.so
   libubsan.so libasan.so libtsan.so liblsan.so libgphobos.so)
   conflicts=(gcc-libs)
-  replaces=(gcc-multilib-git libgphobos)
+  replaces=(gcc-multilib-git libgphobos-git)
 
   cd gcc-build
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
@@ -210,7 +210,7 @@ package_gcc-git() {
   provides=(gcc{,-multilib{,-git}})
   conflicts=(gcc)
   replaces=(gcc-multilib-git)
-  options=(!emptydirs staticlibs debug)
+  options=(!emptydirs staticlibs)
 
   cd gcc-build
 
@@ -452,10 +452,11 @@ package_lib32-gcc-libs-git() {
 
 package_gcc-d-git() {
   pkgdesc="D frontend for GCC (git version)"
-  depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
-  provides=(gdc)
-  replaces=(gdc)
-  options=(staticlibs !debug)
+  depends=("gcc-git=$pkgver-$pkgrel")
+  provides=(gcc-d gdc{,-git})
+  conflicts=(gcc-d)
+  replaces=(gdc-git)
+  options=(staticlibs)
 
   cd gcc-build
   make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
@@ -477,7 +478,6 @@ package_lto-dump-git() {
   pkgdesc="Dump link time optimization object files (git version)"
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
   provides=(lto-dump lto-dump-git)
-  replaces=(lto-dump)
   conflicts=(lto-dump)
 
   cd gcc-build
@@ -491,6 +491,8 @@ package_lto-dump-git() {
 package_libgccjit-git() {
   pkgdesc="Just-In-Time Compilation with GCC backend (git version)"
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
+  provides=(libgccjit libgccjit-git)
+  conflicts=(libgccjit)
 
   cd gcc-build
   make -C gcc DESTDIR="$pkgdir" jit.install-common jit.install-info