aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-12-10 12:08:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-12-10 12:08:50 +0000
commit4b7792bab0db94d8cc2199a5c1b90092b962b745 (patch)
treee5fa342401082c64d17f2a1cce0f1a751d24cdb2
parent2dba4320dbf6396b4814e728f62b81393010f658 (diff)
downloadaports-4b7792bab0db94d8cc2199a5c1b90092b962b745.tar.gz
aports-4b7792bab0db94d8cc2199a5c1b90092b962b745.tar.bz2
aports-4b7792bab0db94d8cc2199a5c1b90092b962b745.tar.xz
main/abuild: fix duplicate so:* provides
-rw-r--r--main/abuild/APKBUILD8
-rw-r--r--main/abuild/git.patch72
2 files changed, 71 insertions, 9 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index f48be4f299..74fa932e43 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=2.25.0_rc1
_ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=3
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -66,8 +66,8 @@ gems() {
}
md5sums="6fd1f7b99247618cbf0ca22b7c6cec1b abuild-2.25.0_rc1.tar.xz
-4ab04221889b9d35f3d9c2999e676f47 git.patch"
+2e38fe9b42bc5703e3975354f83d284e git.patch"
sha256sums="2addf0e0a518d85669f5a6cbe593ea7d57232d8573acd1a9e322b68e5a14614d abuild-2.25.0_rc1.tar.xz
-9d1c11a4bd4e1009bfd17d3483fa013061d8b32e1ed8b4cb0c259a24e658378a git.patch"
+a4e2fb1e2f2d9cea2d0bcc20e807a2ee449f52d8d16a1c2940bf386fc9e633cf git.patch"
sha512sums="6dca86b68f57aaa4df0a1401098d2264d33c44380a0186ae3b03784e8f648ac17317d7ce7d3586db45d3d36ca65454fc53e032bd7b58f22f356c937038a991e5 abuild-2.25.0_rc1.tar.xz
-f749307b40100dc03521bce11d55b83e08f96309d91b2845e7ba3d8a6a8188baeb9fceeb26adb58a35d3c201b2e6e67ea08742f9fd2cf63501e657c5cc615823 git.patch"
+e1163cb00b894b648913431651bb9c1d92697769b77e4748a733e1cfedd399d3212e4c580ed9e9b576c5842b8350c5e521a940adeb14c4bbebb9f93d1405b3a8 git.patch"
diff --git a/main/abuild/git.patch b/main/abuild/git.patch
index cba100cc83..5a43e4b4fa 100644
--- a/main/abuild/git.patch
+++ b/main/abuild/git.patch
@@ -1,5 +1,17 @@
+diff --git a/.gitignore b/.gitignore
+index 9018782..ac669f6 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,6 +1,7 @@
+ *.tar.bz2
+ *.o
+ abuild
++abuild-fetch
+ abuild-keygen
+ abuild-sign
+ abuild-sudo
diff --git a/abuild.in b/abuild.in
-index 0dd8f9a..8d06261 100644
+index 0dd8f9a..1f330b1 100644
--- a/abuild.in
+++ b/abuild.in
@@ -886,13 +886,14 @@ prepare_trace_rpaths() {
@@ -20,7 +32,17 @@ index 0dd8f9a..8d06261 100644
fi
done
}
-@@ -1190,11 +1191,16 @@ scan_shared_objects() {
+@@ -1076,7 +1077,8 @@ trace_apk_deps() {
+
+ echo "# automatically detected:" >> "$dir"/.PKGINFO
+ if [ -f "$dir"/.provides-so ]; then
+- sed 's/^\(.*\) \([0-9].*\)/provides = so:\1=\2/' "$dir"/.provides-so \
++ sed 's/^\(.*\) \([0-9].*\)/provides = so:\1=\2/' \
++ "$dir"/.provides-so | sort -u \
+ >> "$dir"/.PKGINFO
+ fi
+ if [ -f "$dir"/.provides-pc ]; then
+@@ -1190,11 +1192,16 @@ scan_shared_objects() {
done > "$controldir"/.needs-so
}
@@ -40,7 +62,7 @@ index 0dd8f9a..8d06261 100644
for i; do
case "$i" in
"."|"") continue;;
-@@ -1217,10 +1223,7 @@ scan_symlink_targets() {
+@@ -1217,10 +1224,7 @@ scan_symlink_targets() {
fi
while read symlink target; do
@@ -52,7 +74,7 @@ index 0dd8f9a..8d06261 100644
if [ -e "$targetpath" ] || [ -L "$targetpath" ]; then
echo "$name=$pkgver-r$pkgrel" \
>> "$d"/.symlinks-needs
-@@ -1721,14 +1724,12 @@ builddeps() {
+@@ -1721,14 +1725,12 @@ builddeps() {
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done
@@ -69,7 +91,33 @@ index 0dd8f9a..8d06261 100644
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done
-@@ -1962,9 +1963,8 @@ post_add() {
+@@ -1739,15 +1741,21 @@ builddeps() {
+
+ # find which deps are missing
+ for i in $builddeps; do
+- if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then
+- error "Conflicting package installed: ${i#\!}"
++ if [ "${i#\!}" != "$i" ]; then
++ if $APK info --quiet --installed "${i#\!}"; then
++ error "Conflicting package installed: ${i#\!}"
++ return 1
++ fi
+ elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then
+ missing="$missing $i"
+ fi
+ done
+ for i in $hostdeps; do
+- if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
+- error "Conflicting package installed: ${i#\!}"
++ if [ "${i#\!}" != "$i" ]; then
++ if $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
++ error "Conflicting package installed: ${i#\!}"
++ return 1
++ fi
+ elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
+ missing="$missing $i"
+ fi
+@@ -1962,9 +1970,8 @@ post_add() {
}
deps() {
@@ -81,6 +129,20 @@ index 0dd8f9a..8d06261 100644
[ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done
+diff --git a/functions.sh.in b/functions.sh.in
+index e9b7280..c128e8d 100644
+--- a/functions.sh.in
++++ b/functions.sh.in
+@@ -6,7 +6,8 @@ program=${0##*/}
+ hostspec_to_arch() {
+ case "$1" in
+ arm*-*-*-*eabi) echo "armel" ;;
+- arm*-*-*-*eabihf) echo "armhf" ;;
++ armv6*-*-*-*eabihf) echo "armhf" ;;
++ armv7*-*-*-*eabihf) echo "armv7" ;;
+ i[0-9]86-*-*-*) echo "x86" ;;
+ x86_64-*-*-*) echo "x86_64" ;;
+ *) echo "unknown" ;;
diff --git a/newapkbuild.in b/newapkbuild.in
index 5ba51fb..a47dcae 100644
--- a/newapkbuild.in