diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-10 12:08:07 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-10 12:08:50 +0000 |
commit | 4b7792bab0db94d8cc2199a5c1b90092b962b745 (patch) | |
tree | e5fa342401082c64d17f2a1cce0f1a751d24cdb2 /main/abuild/git.patch | |
parent | 2dba4320dbf6396b4814e728f62b81393010f658 (diff) |
main/abuild: fix duplicate so:* provides
Diffstat (limited to 'main/abuild/git.patch')
-rw-r--r-- | main/abuild/git.patch | 72 |
1 files changed, 67 insertions, 5 deletions
diff --git a/main/abuild/git.patch b/main/abuild/git.patch index cba100cc838..5a43e4b4fa8 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 |