moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

common: merge only_for_archs and noarch=yes into one.

Browse source 
* noarch=yes is replaced with archs=noarch
* only_for_archs= is renamed to archs=
* archs= allows the use of wildcards and negations; first matching rule applies:
  * archs="*-musl" will build the pkg only for musl-libcs
  * archs="~*-musl" will build the pkg only on non-musl-libc
  * archs="x86_64-musl ~*-musl" will build for x86_64-musl and any non-musl
    arch.
* archs= defaults to "*"
This commit is contained in:
Enno Boland 2015-12-03 10:04:16 +01:00 • committed by Enno Boland
parent e9769c2171
commit 6eb37e35b2
11 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/hooks/post-pkg/00-register-pkg.sh
View file

@ -13,14 +13,14 @@ registerpkg() {
hook() {
local arch= binpkg= pkgdir=
if [ -n "$noarch" ]; then
if [ "${archs// /}" = "noarch" ]; then
arch=noarch
elif [ -n "$XBPS_TARGET_MACHINE" ]; then
arch=$XBPS_TARGET_MACHINE
else
arch=$XBPS_MACHINE
fi
if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
if [ -n "$repository" ]; then