diff options
| author | Milan Stastny | 2021-09-21 10:30:18 +0200 |
|---|---|---|
| committer | Milan Stastny | 2021-09-21 10:30:18 +0200 |
| commit | e2bbf6a1fc9d9c280f575d302b6a07bd5f97ed16 (patch) | |
| tree | a5bd55a19e22e2964612ec63f6c4f4e98160f62e | |
| parent | ef44e52829dd5da6d9c514af4ddb37ea6896e764 (diff) | |
| download | aur-e2bbf6a1fc9d9c280f575d302b6a07bd5f97ed16.tar.gz | |
Update conflicts
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 10 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = glibc-dso pkgver = 2.33 - pkgrel = 7 + pkgrel = 8 url = https://www.gnu.org/software/libc arch = x86_64 license = GPL @@ -11,8 +11,6 @@ pkgbase = glibc-dso makedepends = python makedepends = cpio optdepends = perl: for mtrace - provides = glibc=2.33 - conflicts = glibc options = !strip options = staticlibs source = https://ftp.gnu.org/gnu/glibc/glibc-2.33.tar.xz @@ -51,6 +49,8 @@ pkgname = glibc-dso depends = tzdata depends = filesystem optdepends = gd: for memusagestat + provides = glibc=2.33 + conflicts = glibc backup = etc/gai.conf backup = etc/locale.gen backup = etc/nscd.conf @@ -58,6 +58,8 @@ pkgname = glibc-dso pkgname = lib32-glibc-dso pkgdesc = GNU C Library (32-bit) - DSO patch depends = glibc=2.33 + provides = lib32-glibc=2.33 + conflicts = lib32-glibc options = !strip options = staticlibs options = !emptydirs @@ -6,15 +6,13 @@ pkgbase=glibc-dso pkgname=(glibc-dso lib32-glibc-dso) pkgver=2.33 -pkgrel=7 +pkgrel=8 arch=(x86_64) -provides=("glibc=${pkgver%%.r*}") url='https://www.gnu.org/software/libc' license=(GPL LGPL) makedepends=(git gd lib32-gcc-libs python cpio) optdepends=('perl: for mtrace') options=(!strip staticlibs) -conflicts=('glibc') #_commit=3de512be7ea6053255afed6154db9ee31d4e557a #source=(git+https://sourceware.org/git/glibc.git#commit=$_commit source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig} @@ -171,6 +169,8 @@ package_glibc-dso() { backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) + provides=("glibc=${pkgver%%.r*}") + conflicts=('glibc') install -dm755 "$pkgdir/etc" touch "$pkgdir/etc/ld.so.conf" @@ -224,6 +224,8 @@ package_lib32-glibc-dso() { pkgdesc='GNU C Library (32-bit) - DSO patch' depends=("glibc=$pkgver") options+=('!emptydirs') + provides=("lib32-glibc=${pkgver%%.r*}") + conflicts=('lib32-glibc') cd lib32-glibc-build |