summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRené Wagner2020-04-11 20:51:44 +0200
committerRené Wagner2020-04-11 20:51:44 +0200
commit648522d16e1eb53a80b071736470a481e3493a4d (patch)
tree3ec6eab2a89efe2c9e65419e32b6c7432b34c1aa
parent531659fd1808f08d30123ddee095c621c225c40f (diff)
downloadaur-648522d16e1eb53a80b071736470a481e3493a4d.tar.gz
add conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e776ba76ddc7..37729a091d1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = mimalloc
makedepends = git
depends = glibc
provides = mimalloc
+ conflicts = mimalloc-git
source = ::git+https://github.com/microsoft/.git#tag=v1.6.1
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4e189954f87d..8e064f054491 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc='General-purpose allocator with excellent performance characteristics'
arch=('x86_64')
license=('MIT')
url='https://github.com/microsoft/mimalloc'
+conflicts=('mimalloc-git')
depends=('glibc')
makedepends=('cmake' 'git')
provides=('mimalloc')