summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexei Colin2020-07-18 02:30:58 -0400
committerAlexei Colin2020-07-18 02:30:58 -0400
commit4f51ed629220e55f36491d422c750a52281b2df4 (patch)
tree33bc4ab8457db20d5442b9fb9c041df9693da155
parent1753493eb7ca23bdaa82cdaddb44ca28e73cc7c6 (diff)
downloadaur-4f51ed629220e55f36491d422c750a52281b2df4.tar.gz
conflict on ccstudio
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bafc8aeb666f..98a8d6c3ae7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,7 @@ pkgbase = ti-cgt-arm
license = custom
makedepends = lib32-glibc
makedepends = lib32-fakeroot
- optdepends = ccstudio
+ conflicts = ccstudio
options = !strip
options = libtool
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index e3240f6de9fc..aea7e5b1f157 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@ license=('custom')
# lib32-glibc needed for the installer
makedepends=('lib32-glibc' 'lib32-fakeroot')
-
-optdepends=('ccstudio')
+#optdepends=('ccstudio')
+conflicts=('ccstudio') # current package ships with the toolchains
_installer="ti_cgt_tms470_${pkgver}_linux_installer_x86.bin"
source=("http://software-dl.ti.com/codegen/esd/cgt_public_sw/TMS470/${pkgver}/${_installer}")