David Runge pushed to branch main at Arch Linux / Packaging / Packages / php-igbinary
Commits: 1bc32bc1 by David Runge at 2024-03-14T22:29:58+01:00 Remove php-igbinary provides for php-legacy-igbinary Remove the wrong provides for php-igbinary and a custom interpreter provides, which have been a leftover from a test setup for nextcloud over a year ago (which did not work). Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/php-igbinary/-/issues/1 Signed-off-by: David Runge <[email protected]> - - - - - 67953e3b by David Runge at 2024-03-14T22:30:29+01:00 Simplify configuring the build and running tests Abstract configure options in a local bash array. Subshells are not needed for running the tests for the two different versions. Signed-off-by: David Runge <[email protected]> - - - - - 306b0732 by David Runge at 2024-03-14T22:31:40+01:00 upgpkg: 3.2.15-4 Rebuild to remove a broken provides setup and simplify build and test. - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = php-igbinary pkgdesc = A drop in replacement for the standard php serializer pkgver = 3.2.15 - pkgrel = 3 + pkgrel = 4 url = https://github.com/igbinary/igbinary arch = x86_64 license = BSD-3-Clause @@ -15,11 +15,9 @@ pkgbase = php-igbinary pkgname = php-igbinary depends = glibc depends = php - provides = backup = etc/php/conf.d/igbinary.ini pkgname = php-legacy-igbinary depends = glibc depends = php-legacy - provides = backup = etc/php-legacy/conf.d/igbinary.ini ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ _name=igbinary pkgbase=php-igbinary pkgname=(php-igbinary php-legacy-igbinary) pkgver=3.2.15 -pkgrel=3 +pkgrel=4 pkgdesc="A drop in replacement for the standard php serializer" arch=(x86_64) url="https://github.com/igbinary/igbinary"; @@ -32,35 +32,30 @@ prepare() { } build() { + local configure_options=( + --prefix=/usr + --enable-igbinary + ) + ( cd $pkgbase-$pkgver - ./configure --prefix=/usr \ - --enable-igbinary + ./configure "${configure_options[@]}" make ) ( cd ${pkgname[1]}-$pkgver - ./configure --prefix=/usr \ - --enable-igbinary + ./configure "${configure_options[@]}" make ) } check() { - ( - NO_INTERACTION=1 make -k test -C $pkgbase-$pkgver - ) - ( - NO_INTERACTION=1 make -k test -C ${pkgname[1]}-$pkgver - ) + NO_INTERACTION=1 make -k test -C $pkgbase-$pkgver + NO_INTERACTION=1 make -k test -C ${pkgname[1]}-$pkgver } package_php-igbinary() { - local _interpreter_version="$(php --version |head -n1 |cut -d ' ' -f2)" - depends+=(php) - _provides=(php-igbinary-interpreter=${_interpreter_version%.*}) - provides=("${_provides[@]}") backup=(etc/php/conf.d/$_name.ini) cd $pkgname-$pkgver @@ -71,11 +66,7 @@ package_php-igbinary() { } package_php-legacy-igbinary() { - local _interpreter_version="$(php-legacy --version |head -n1 |cut -d ' ' -f2)" - depends+=(php-legacy) - _provides=(php-igbinary=$pkgver php-igbinary-interpreter=${_interpreter_version%.*}) - provides=("${_provides[@]}") backup=(etc/php-legacy/conf.d/$_name.ini) cd $pkgname-$pkgver View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/php-igbinary/-/compare/55e581fa67206ce161ad540b5f4fc60b9e4cd320...306b073243c9181529bc99ec36b988d284d67cf1 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/php-igbinary/-/compare/55e581fa67206ce161ad540b5f4fc60b9e4cd320...306b073243c9181529bc99ec36b988d284d67cf1 You're receiving this email because of your account on gitlab.archlinux.org.
