- Drop conflicts with swift-language-git
- Add ld.so.conf
This commit is contained in:
Ryan Gonzalez 2020-10-25 20:36:22 -05:00
parent fbed243a1c
commit c11c5ce14d
2 changed files with 5 additions and 4 deletions

View file

@ -1,7 +1,7 @@
pkgbase = swift-bin pkgbase = swift-bin
pkgdesc = Binary builds of the Swift programming language pkgdesc = Binary builds of the Swift programming language
pkgver = 5.3 pkgver = 5.3
pkgrel = 1 pkgrel = 2
url = https://swift.org url = https://swift.org
arch = x86_64 arch = x86_64
license = apache license = apache
@ -11,7 +11,6 @@ pkgbase = swift-bin
depends = libxml2 depends = libxml2
depends = python2 depends = python2
provides = swift-language provides = swift-language
conflicts = swift-language-git
replaces = swift-language-bin replaces = swift-language-bin
options = !strip options = !strip
source = https://swift.org/builds/swift-5.3-release/centos8/swift-5.3-RELEASE/swift-5.3-RELEASE-centos8.tar.gz source = https://swift.org/builds/swift-5.3-release/centos8/swift-5.3-RELEASE/swift-5.3-RELEASE-centos8.tar.gz

View file

@ -3,14 +3,13 @@
pkgname=swift-bin pkgname=swift-bin
pkgver=5.3 pkgver=5.3
pkgrel=1 pkgrel=2
pkgdesc="Binary builds of the Swift programming language" pkgdesc="Binary builds of the Swift programming language"
arch=('x86_64') arch=('x86_64')
url="https://swift.org" url="https://swift.org"
license=('apache') license=('apache')
depends=('libutil-linux' 'libxml2' 'python2') depends=('libutil-linux' 'libxml2' 'python2')
makedepends=('patchelf' 'rpmextract') makedepends=('patchelf' 'rpmextract')
conflicts=('swift-language-git')
options=('!strip') options=('!strip')
provides=('swift-language') provides=('swift-language')
replaces=('swift-language-bin') replaces=('swift-language-bin')
@ -41,4 +40,7 @@ package() {
patchelf+=(--replace-needed "lib${lib}.so.6" "lib${lib}w.so") patchelf+=(--replace-needed "lib${lib}.so.6" "lib${lib}w.so")
done done
find_elf_only -exec "${patchelf[@]}" {} \; find_elf_only -exec "${patchelf[@]}" {} \;
install -dm755 "${pkgdir}/etc/ld.so.conf.d"
echo '/usr/lib/swift/lib/swift/linux' >> "${pkgdir}/etc/ld.so.conf.d/swift.conf"
} }