mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 10:26:18 +02:00
Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
3de03e8b1f | ||
![]() |
720b7c9b05 | ||
![]() |
0ea7e9e0e5 | ||
![]() |
be5f54c95c | ||
![]() |
5c6e13a672 |
2
Makefile
2
Makefile
@@ -1,6 +1,6 @@
|
||||
SHELL=/bin/bash
|
||||
|
||||
V=1.0.2
|
||||
V=1.0.3
|
||||
BUILDTOOLVER ?= $(V)
|
||||
|
||||
PREFIX = /usr/local
|
||||
|
@@ -42,6 +42,7 @@ will automatically build the project and proxy all calls to the local build dire
|
||||
- binutils
|
||||
- coreutils
|
||||
- diffutils
|
||||
- fakeroot
|
||||
- findutils
|
||||
- grep
|
||||
- jq
|
||||
|
@@ -111,7 +111,7 @@ if (( ${#validpgpkeys[@]} != 0 )); then
|
||||
fi
|
||||
|
||||
# find files which should be under source control
|
||||
needsversioning=()
|
||||
needsversioning=(PKGBUILD)
|
||||
for s in "${source[@]}"; do
|
||||
[[ $s != *://* ]] && needsversioning+=("$s")
|
||||
done
|
||||
|
@@ -129,7 +129,7 @@ pkgctl_build() {
|
||||
local WORKER_SLOT=
|
||||
|
||||
# variables
|
||||
local path pkgbase pkgrepo source
|
||||
local loop_arch path pkgbase pkgrepo source
|
||||
|
||||
while (( $# )); do
|
||||
case $1 in
|
||||
@@ -318,7 +318,13 @@ pkgctl_build() {
|
||||
if in_array any "${arch[@]}"; then
|
||||
BUILD_ARCH=("${_arch[0]}")
|
||||
else
|
||||
BUILD_ARCH+=("${arch[@]}")
|
||||
for loop_arch in "${arch[@]}"; do
|
||||
if in_array "${loop_arch}" "${_arch[@]}"; then
|
||||
BUILD_ARCH+=("$loop_arch")
|
||||
else
|
||||
warning 'invalid architecture, not building for: %s' "${loop_arch}"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -329,7 +335,7 @@ pkgctl_build() {
|
||||
|
||||
# increment pkgrel on rebuild
|
||||
if (( REBUILD )); then
|
||||
# try to figure out of pkgrel has been changed
|
||||
# try to figure out if pkgrel has been changed
|
||||
if ! old_pkgrel=$(git_diff_tree HEAD PKGBUILD | grep --perl-regexp --only-matching --max-count=1 '^-pkgrel=\K\w+'); then
|
||||
old_pkgrel=${pkgrel}
|
||||
fi
|
||||
|
Reference in New Issue
Block a user