|
|
|
@ -1,5 +1,5 @@ |
|
|
|
--- abuild-3.2.0/abuild.in 2018-06-22 10:24:10.000000000 +0300
|
|
|
|
+++ abuild-3.2.0.mod/abuild.in 2018-11-19 21:58:52.504252644 +0200
|
|
|
|
+++ abuild-3.2.0.mod/abuild.in 2018-11-19 22:01:34.476022065 +0200
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-#!/bin/ash -e
|
|
|
|
+#!/bin/bash -e
|
|
|
|
@ -146,7 +146,19 @@ |
|
|
|
local exclude="AND OR WITH" |
|
|
|
if options_has "!spdx" || ! [ -f "$license_list" ]; then |
|
|
|
return 0 |
|
|
|
@@ -933,7 +902,7 @@
|
|
|
|
@@ -917,10 +886,7 @@
|
|
|
|
local builddate=$(date -u "+%s") |
|
|
|
|
|
|
|
# Fix package size on several filesystems |
|
|
|
- case "$(df -PT . | awk 'END {print $2}')" in
|
|
|
|
- btrfs|ecryptfs|zfs)
|
|
|
|
- sync;;
|
|
|
|
- esac
|
|
|
|
+ sync
|
|
|
|
|
|
|
|
local size=$(du -sk | awk '{print $1 * 1024}') |
|
|
|
|
|
|
|
@@ -933,7 +899,7 @@
|
|
|
|
|
|
|
|
echo "# Generated by $(basename $0) $program_version" >"$pkginfo" |
|
|
|
if [ -n "$FAKEROOTKEY" ]; then |
|
|
|
@ -155,7 +167,7 @@ |
|
|
|
fi |
|
|
|
echo "# $(date -u)" >> "$pkginfo" |
|
|
|
cat >> "$pkginfo" <<-EOF |
|
|
|
@@ -953,9 +922,9 @@
|
|
|
|
@@ -953,9 +919,9 @@
|
|
|
|
for i in $install $triggers; do |
|
|
|
local s=${i%=*} |
|
|
|
[ "$name" != "${s%.*}" ] && continue |
|
|
|
@ -168,7 +180,7 @@ |
|
|
|
break |
|
|
|
fi |
|
|
|
done |
|
|
|
@@ -1025,8 +994,8 @@
|
|
|
|
@@ -1025,8 +991,8 @@
|
|
|
|
scanelf --quiet --recursive --rpath "$dir" \ |
|
|
|
| sed -e 's/[[:space:]].*//' -e 's/:/\n/' | sort -u \ |
|
|
|
>"$controldir"/.rpaths |
|
|
|
@ -179,7 +191,7 @@ |
|
|
|
fi |
|
|
|
if grep '^/home/' "$controldir"/.rpaths; then |
|
|
|
error "Has /home/... in rpath" |
|
|
|
@@ -1052,12 +1021,12 @@
|
|
|
|
@@ -1052,12 +1018,12 @@
|
|
|
|
local dir="${subpkgdir:-$pkgdir}" |
|
|
|
options_has "!tracedeps" && return 0 |
|
|
|
cd "$dir" || return 1 |
|
|
|
@ -194,7 +206,7 @@ |
|
|
|
--modversion ${f%.pc}) |
|
|
|
echo "${f%.pc}=${v:-0}" >> "$controldir"/.provides-pc |
|
|
|
done |
|
|
|
@@ -1147,12 +1116,19 @@
|
|
|
|
@@ -1147,12 +1113,19 @@
|
|
|
|
return 1 |
|
|
|
} |
|
|
|
|
|
|
|
@ -216,7 +228,7 @@ |
|
|
|
shift |
|
|
|
done |
|
|
|
return 0 |
|
|
|
@@ -1185,20 +1161,12 @@
|
|
|
|
@@ -1185,20 +1158,12 @@
|
|
|
|
esac |
|
|
|
|
|
|
|
msg "Tracing dependencies..." |
|
|
|
@ -239,7 +251,7 @@ |
|
|
|
[ -f "$dir"/.needs-so ] && for i in $(cat "$dir"/.needs-so); do |
|
|
|
# first check if its provided by same apkbuild |
|
|
|
grep -q -w "^$sonameprefix$i" "$dir"/.provides-so 2>/dev/null && continue |
|
|
|
@@ -1215,7 +1183,7 @@
|
|
|
|
@@ -1215,7 +1180,7 @@
|
|
|
|
|
|
|
|
# find all packages that holds the so files |
|
|
|
if [ -f "$dir"/.rpaths ]; then |
|
|
|
@ -248,7 +260,7 @@ |
|
|
|
|| return 1 |
|
|
|
deppkgs=$($APK $apkroot info --quiet --who-owns $so_files) || return 1 |
|
|
|
fi |
|
|
|
@@ -1244,7 +1212,7 @@
|
|
|
|
@@ -1244,7 +1209,7 @@
|
|
|
|
autodeps="$autodeps pc:$i" |
|
|
|
else |
|
|
|
warning "Could not find any provider for pc:$i" |
|
|
|
@ -257,7 +269,7 @@ |
|
|
|
if [ -e "$pcfile" ]; then |
|
|
|
local owner=$($APK $apkroot info --quiet --who-owns $pcfile) |
|
|
|
warning "${owner:-package providing $pcfile} needs to be rebuilt" |
|
|
|
@@ -1276,7 +1244,7 @@
|
|
|
|
@@ -1276,7 +1241,7 @@
|
|
|
|
|
|
|
|
find_scanelf_paths() { |
|
|
|
local datadir="$1" |
|
|
|
@ -266,7 +278,7 @@ |
|
|
|
if [ -n "$ldpath" ]; then |
|
|
|
paths="$paths:$(echo "${datadir}${ldpath}" | sed "s|:|:$datadir|g")" |
|
|
|
fi |
|
|
|
@@ -1422,7 +1390,7 @@
|
|
|
|
@@ -1422,7 +1387,7 @@
|
|
|
|
name="$(pkginfo_val pkgname "$controldir"/.PKGINFO)" |
|
|
|
datadir="$pkgbasedir"/$name |
|
|
|
for i in $(sort -u "$provides_pc"); do |
|
|
|
@ -275,7 +287,7 @@ |
|
|
|
--print-requires \ |
|
|
|
--print-requires-private ${i%=*} \ |
|
|
|
| sed -E 's/\s*([<>=]+)\s*/\1/' \ |
|
|
|
@@ -1502,14 +1470,11 @@
|
|
|
|
@@ -1502,14 +1467,11 @@
|
|
|
|
} |
|
|
|
|
|
|
|
build_abuildrepo() { |
|
|
|
@ -291,7 +303,7 @@ |
|
|
|
if ! want_check; then |
|
|
|
_check=true |
|
|
|
fi |
|
|
|
@@ -1524,7 +1489,6 @@
|
|
|
|
@@ -1524,7 +1486,6 @@
|
|
|
|
fetch |
|
|
|
unpack |
|
|
|
prepare |
|
|
|
@ -299,7 +311,7 @@ |
|
|
|
$_build |
|
|
|
$_check |
|
|
|
rootpkg |
|
|
|
@@ -1590,14 +1554,14 @@
|
|
|
|
@@ -1590,14 +1551,14 @@
|
|
|
|
|
|
|
|
local i |
|
|
|
for i in doc man info html sgml licenses gtk-doc ri help; do |
|
|
|
@ -318,7 +330,7 @@ |
|
|
|
[ -d "$mandir" ] && find "$mandir" -type l \ |
|
|
|
-a \( -name \*.[0-8n] -o -name \*.[0-8][a-z]* \) \ |
|
|
|
-a \! \( -name '*.gz' -o -name '*.bz2' -o -name '*.xz' \) \ |
|
|
|
@@ -1629,10 +1593,10 @@
|
|
|
|
@@ -1629,10 +1590,10 @@
|
|
|
|
[ $islink -eq 0 ] && gzip -9 "$name" |
|
|
|
done |
|
|
|
|
|
|
|
@ -331,7 +343,7 @@ |
|
|
|
} |
|
|
|
|
|
|
|
doc() { |
|
|
|
@@ -1648,18 +1612,16 @@
|
|
|
|
@@ -1648,18 +1609,16 @@
|
|
|
|
for f in $binfiles; do |
|
|
|
srcdir=$(dirname $pkgdir/$f) |
|
|
|
srcfile=$(basename $pkgdir/$f) |
|
|
|
@ -352,7 +364,7 @@ |
|
|
|
done |
|
|
|
return 0 |
|
|
|
} |
|
|
|
@@ -1675,14 +1637,14 @@
|
|
|
|
@@ -1675,14 +1634,14 @@
|
|
|
|
pkgdesc="$pkgdesc (development files)" |
|
|
|
|
|
|
|
cd "$pkgdir" || return 0 |
|
|
|
@ -374,7 +386,7 @@ |
|
|
|
$(find . -name include -type d) \ |
|
|
|
$(find $libdirs -name '*.[acho]' \ |
|
|
|
-o -name '*.prl' 2>/dev/null); do |
|
|
|
@@ -1747,33 +1709,17 @@
|
|
|
|
@@ -1747,33 +1706,17 @@
|
|
|
|
type "$1" 2>&1 | head -n 1 | egrep -q "is a (shell )?function" |
|
|
|
} |
|
|
|
|
|
|
|
@ -411,7 +423,7 @@ |
|
|
|
$_package \ |
|
|
|
prepare_subpackages \ |
|
|
|
prepare_language_packs \ |
|
|
|
@@ -2096,7 +2042,7 @@
|
|
|
|
@@ -2096,7 +2039,7 @@
|
|
|
|
$install_deps $recursive $upgrade $color_opt \ |
|
|
|
abuildindex || return 1 |
|
|
|
done |
|
|
|
@ -420,7 +432,7 @@ |
|
|
|
$apk_opt_wait \ |
|
|
|
--virtual .makedepends-$pkgname $builddeps \ |
|
|
|
|| return 1 |
|
|
|
@@ -2125,14 +2071,11 @@
|
|
|
|
@@ -2125,14 +2068,11 @@
|
|
|
|
} |
|
|
|
|
|
|
|
rootbld_actions() { |
|
|
|
@ -436,7 +448,7 @@ |
|
|
|
if ! want_check; then |
|
|
|
_check=true |
|
|
|
fi |
|
|
|
@@ -2163,8 +2106,6 @@
|
|
|
|
@@ -2163,8 +2103,6 @@
|
|
|
|
|
|
|
|
msg "Preparing build chroot..." |
|
|
|
|
|
|
|
@ -445,7 +457,7 @@ |
|
|
|
BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX) |
|
|
|
local aportsgit=${APORTSDIR:-${startdir}} |
|
|
|
|
|
|
|
@@ -2205,7 +2146,7 @@
|
|
|
|
@@ -2205,7 +2143,7 @@
|
|
|
|
) < "$repo_template" > "$BUILD_ROOT/etc/apk/repositories" |
|
|
|
|
|
|
|
calcdeps |
|
|
|
@ -454,7 +466,7 @@ |
|
|
|
abuild alpine-base build-base git $hostdeps $builddeps |
|
|
|
|
|
|
|
local bwrap_opts="" |
|
|
|
@@ -2252,11 +2193,7 @@
|
|
|
|
@@ -2252,11 +2190,7 @@
|
|
|
|
[ -e "$filename" ] || continue |
|
|
|
|
|
|
|
[ "$osabi" != "STANDALONE" ] || continue |
|
|
|
@ -466,7 +478,7 @@ |
|
|
|
done |
|
|
|
} |
|
|
|
|
|
|
|
@@ -2346,22 +2283,22 @@
|
|
|
|
@@ -2346,22 +2280,22 @@
|
|
|
|
|
|
|
|
local _quiet="$1" |
|
|
|
[ -z "$_quiet" ] && msg "Installing for build:$builddeps" |
|
|
|
@ -493,7 +505,7 @@ |
|
|
|
--no-scripts .makedepends-$pkgname || : |
|
|
|
fi |
|
|
|
} |
|
|
|
@@ -2481,7 +2418,7 @@
|
|
|
|
@@ -2481,7 +2415,7 @@
|
|
|
|
package Install project into $pkgdir |
|
|
|
prepare Apply patches |
|
|
|
rootbld Build package in clean chroot |
|
|
|
@ -502,7 +514,7 @@ |
|
|
|
sanitycheck Basic sanity check of APKBUILD |
|
|
|
snapshot Create a \$giturl or \$svnurl snapshot and upload to \$disturl |
|
|
|
sourcecheck Check if remote source package exists upstream |
|
|
|
@@ -2563,7 +2500,7 @@
|
|
|
|
@@ -2563,7 +2497,7 @@
|
|
|
|
if [ -z "$REPODEST" ]; then |
|
|
|
warning "REPODEST is not set and is now required. Defaulting to ~/packages" |
|
|
|
[ -n "$PKGDEST" ] && die "PKGDEST is no longer supported." |
|
|
|
|
Leonid Plyushch
6 years ago
Fredrik Fornwall