summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2019-03-13 19:36:50 +0100
committerMichel Zou2019-03-13 19:36:50 +0100
commit8b83b91e9ca73d0767dd268681b5e79349e258af (patch)
tree67dedf17ade9a22f2c5fb4284db47c6bc648ebbc
parent55a73161f4e95b9638f7f79daee43d5d88b6f69b (diff)
downloadaur-8b83b91e9ca73d0767dd268681b5e79349e258af.tar.gz
Revert "-conflicts=('psp-gcc-base')"
This reverts commit 55a73161f4e95b9638f7f79daee43d5d88b6f69b.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c40790fd78f..4d3744e2cb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = psp-gcc
depends = psp-newlib
depends = mpfr
provides = psp-gcc-base
+ conflicts = psp-gcc-base
options = !buildflags
options = !strip
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 37d7406af0a..46856a7a7dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ url="http://gcc.gnu.org"
license=('GPL' 'LGPL' 'FDL' 'custom')
groups=('psp')
depends=('psp-binutils' 'psp-newlib' 'mpfr')
+conflicts=('psp-gcc-base')
provides=('psp-gcc-base')
options=('!buildflags' '!strip' 'staticlibs')
source=("http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2"