New makedepends cargo & clang and new checkdepends procps-ng

RIIR https://github.com/fish-shell/fish-shell/pull/9512
This commit is contained in:
Akatsuki Rui
2023-02-20 16:27:23 +08:00
parent 8a74fa0f47
commit b071d9033b
2 changed files with 63 additions and 40 deletions

View File

@@ -1,6 +1,6 @@
pkgbase = fish-git pkgbase = fish-git
pkgdesc = User friendly shell intended mostly for interactive use. pkgdesc = User friendly shell intended mostly for interactive use.
pkgver = 3.4.0.r53.g3e5284aaf pkgver = 3.6.0.r217.g59fe124c4
pkgrel = 1 pkgrel = 1
epoch = 2 epoch = 2
url = http://fishshell.com url = http://fishshell.com
@@ -10,23 +10,24 @@ pkgbase = fish-git
arch = arm arch = arm
license = GPL2 license = GPL2
checkdepends = expect checkdepends = expect
checkdepends = procps-ng
makedepends = cargo
makedepends = clang
makedepends = cmake makedepends = cmake
makedepends = python-sphinx
makedepends = git makedepends = git
makedepends = python-sphinx
depends = glibc depends = glibc
depends = gcc-libs depends = gcc-libs
depends = ncurses depends = ncurses
depends = pcre2 depends = pcre2
optdepends = python: man page completion parser / web config tool optdepends = python: man page completion parser / web config tool
optdepends = pkgfile: command-not-found hook optdepends = pkgfile: command-not-found hook
optdepends = wl-clipboard: clipboard integration
optdepends = xsel: clipboard integration
optdepends = xclip: clipboard integration
provides = fish provides = fish
provides = fish-shell provides = fish-shell
conflicts = fish conflicts = fish
conflicts = fish-shell conflicts = fish-shell
backup = etc/fish/config.fish
source = git+https://github.com/fish-shell/fish-shell.git source = git+https://github.com/fish-shell/fish-shell.git
md5sums = SKIP b2sums = SKIP
pkgname = fish-git pkgname = fish-git

View File

@@ -2,42 +2,59 @@
# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Jan Fader <jan.fader@web.de> # Contributor: Jan Fader <jan.fader@web.de>
# Contributor: Stephen Drodge <stephen.drodge@gmail.com> # Contributor: Stephen Drodge <stephen.drodge@gmail.com>
# Contributor: akiirui (AUR) # Contributor: Akatsuki Rui <aur@akii.work>
# Maintainer: SanskritFritz (gmail) # Maintainer: SanskritFritz (gmail)
pkgname=fish-git pkgname=fish-git
_gitname="fish-shell" _gitname="fish-shell"
pkgver=3.4.0.r53.g3e5284aaf pkgver=3.6.0.r217.g59fe124c4
pkgrel=1 pkgrel=1
epoch=2 epoch=2
pkgdesc="User friendly shell intended mostly for interactive use." pkgdesc="User friendly shell intended mostly for interactive use."
arch=('i686' 'x86_64' 'arm') arch=('i686' 'x86_64' 'arm')
url="http://fishshell.com" url="http://fishshell.com"
license=("GPL2") license=('GPL2')
depends=('glibc' 'gcc-libs' 'ncurses' 'pcre2') depends=(
optdepends=('python: man page completion parser / web config tool' 'glibc'
'gcc-libs'
'ncurses'
'pcre2'
)
optdepends=(
'python: man page completion parser / web config tool'
'pkgfile: command-not-found hook' 'pkgfile: command-not-found hook'
'wl-clipboard: clipboard integration' )
'xsel: clipboard integration' makedepends=(
'xclip: clipboard integration') 'cargo'
makedepends=('cmake' 'python-sphinx' 'git') 'clang'
checkdepends=('expect') 'cmake'
provides=('fish' 'fish-shell') 'git'
conflicts=('fish' 'fish-shell') 'python-sphinx'
)
checkdepends=(
'expect'
'procps-ng'
)
provides=(
'fish'
'fish-shell'
)
conflicts=(
'fish'
'fish-shell'
)
source=(
"git+https://github.com/fish-shell/fish-shell.git"
)
install='fish.install' install='fish.install'
source=("git+https://github.com/fish-shell/fish-shell.git") backup=(etc/fish/config.fish)
md5sums=('SKIP') b2sums=('SKIP')
pkgver() { pkgver() {
cd "$_gitname" cd "$_gitname"
git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
} }
check() {
cd "$_gitname"
make -C build test
}
build() { build() {
cd "$_gitname" cd "$_gitname"
export CXXFLAGS+=" ${CPPFLAGS}" export CXXFLAGS+=" ${CPPFLAGS}"
@@ -51,6 +68,11 @@ build() {
make -C build make -C build
} }
check() {
cd "$_gitname"
make -C build test
}
package() { package() {
cd "$_gitname" cd "$_gitname"
make -C build DESTDIR="$pkgdir" install make -C build DESTDIR="$pkgdir" install