diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-22 13:39:57 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-22 13:40:03 +0000 |
commit | 34cb414e46f7c7cd26e4889f1f17dbeb265efbb2 (patch) | |
tree | ef78dc74aa0512a66e62aa962ccdf08caed208bb | |
parent | a56f64db04c8fef48e32592f1485880c7d47049f (diff) | |
download | alpine_aports-34cb414e46f7c7cd26e4889f1f17dbeb265efbb2.tar.bz2 alpine_aports-34cb414e46f7c7cd26e4889f1f17dbeb265efbb2.tar.xz alpine_aports-34cb414e46f7c7cd26e4889f1f17dbeb265efbb2.zip |
main/abuild: upgrade to 2.26.0
-rw-r--r-- | main/abuild/APKBUILD | 14 | ||||
-rw-r--r-- | main/abuild/git.patch | 169 |
2 files changed, 5 insertions, 178 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 74fa932e43..aede231179 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=abuild | 2 | pkgname=abuild |
3 | pkgver=2.25.0_rc1 | 3 | pkgver=2.26.0 |
4 | _ver=${pkgver%_git*} | 4 | _ver=${pkgver%_git*} |
5 | pkgrel=3 | 5 | pkgrel=0 |
6 | pkgdesc="Script to build Alpine Packages" | 6 | pkgdesc="Script to build Alpine Packages" |
7 | url="http://git.alpinelinux.org/cgit/abuild/" | 7 | url="http://git.alpinelinux.org/cgit/abuild/" |
8 | arch="all" | 8 | arch="all" |
@@ -20,7 +20,6 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems" | |||
20 | options="suid" | 20 | options="suid" |
21 | pkggroups="abuild" | 21 | pkggroups="abuild" |
22 | source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz | 22 | source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz |
23 | git.patch | ||
24 | " | 23 | " |
25 | 24 | ||
26 | _builddir="$srcdir/$pkgname-$_ver" | 25 | _builddir="$srcdir/$pkgname-$_ver" |
@@ -65,9 +64,6 @@ gems() { | |||
65 | mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ | 64 | mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ |
66 | } | 65 | } |
67 | 66 | ||
68 | md5sums="6fd1f7b99247618cbf0ca22b7c6cec1b abuild-2.25.0_rc1.tar.xz | 67 | md5sums="063e1862758f43b16c30f296fc2cb1de abuild-2.26.0.tar.xz" |
69 | 2e38fe9b42bc5703e3975354f83d284e git.patch" | 68 | sha256sums="8b5be97371f9f8bb3c50779db842affe884caffea954b1524e3d66164c983095 abuild-2.26.0.tar.xz" |
70 | sha256sums="2addf0e0a518d85669f5a6cbe593ea7d57232d8573acd1a9e322b68e5a14614d abuild-2.25.0_rc1.tar.xz | 69 | sha512sums="f482552f26a3f980093ee57bb4411770b1af70e18e270898030cf23b368bf6fc5dbaaaeb8ed7b72ffcdc279da04d5ba0d5b5ace06909b5f4df28b8fb3bdaa916 abuild-2.26.0.tar.xz" |
71 | a4e2fb1e2f2d9cea2d0bcc20e807a2ee449f52d8d16a1c2940bf386fc9e633cf git.patch" | ||
72 | sha512sums="6dca86b68f57aaa4df0a1401098d2264d33c44380a0186ae3b03784e8f648ac17317d7ce7d3586db45d3d36ca65454fc53e032bd7b58f22f356c937038a991e5 abuild-2.25.0_rc1.tar.xz | ||
73 | e1163cb00b894b648913431651bb9c1d92697769b77e4748a733e1cfedd399d3212e4c580ed9e9b576c5842b8350c5e521a940adeb14c4bbebb9f93d1405b3a8 git.patch" | ||
diff --git a/main/abuild/git.patch b/main/abuild/git.patch deleted file mode 100644 index 5a43e4b4fa..0000000000 --- a/main/abuild/git.patch +++ /dev/null | |||
@@ -1,169 +0,0 @@ | |||
1 | diff --git a/.gitignore b/.gitignore | ||
2 | index 9018782..ac669f6 100644 | ||
3 | --- a/.gitignore | ||
4 | +++ b/.gitignore | ||
5 | @@ -1,6 +1,7 @@ | ||
6 | *.tar.bz2 | ||
7 | *.o | ||
8 | abuild | ||
9 | +abuild-fetch | ||
10 | abuild-keygen | ||
11 | abuild-sign | ||
12 | abuild-sudo | ||
13 | diff --git a/abuild.in b/abuild.in | ||
14 | index 0dd8f9a..1f330b1 100644 | ||
15 | --- a/abuild.in | ||
16 | +++ b/abuild.in | ||
17 | @@ -886,13 +886,14 @@ prepare_trace_rpaths() { | ||
18 | |||
19 | # search for broken symlinks so we later can pull in proper depends | ||
20 | prepare_symlinks() { | ||
21 | + local target | ||
22 | local dir="${subpkgdir:-$pkgdir}" | ||
23 | options_has "!tracedeps" && return 0 | ||
24 | cd "$dir" || return 1 | ||
25 | find -type l | while read symlink; do | ||
26 | - if ! [ -e "$symlink" ]; then | ||
27 | - echo "$symlink $(readlink $symlink)" \ | ||
28 | - >> "$controldir"/.symlinks | ||
29 | + target=$(readlink "$symlink") | ||
30 | + if ! [ -e "$dir$(normalize_target_path "$target" "$symlink")" ]; then | ||
31 | + echo "$symlink $target" >> "$controldir"/.symlinks | ||
32 | fi | ||
33 | done | ||
34 | } | ||
35 | @@ -1076,7 +1077,8 @@ trace_apk_deps() { | ||
36 | |||
37 | echo "# automatically detected:" >> "$dir"/.PKGINFO | ||
38 | if [ -f "$dir"/.provides-so ]; then | ||
39 | - sed 's/^\(.*\) \([0-9].*\)/provides = so:\1=\2/' "$dir"/.provides-so \ | ||
40 | + sed 's/^\(.*\) \([0-9].*\)/provides = so:\1=\2/' \ | ||
41 | + "$dir"/.provides-so | sort -u \ | ||
42 | >> "$dir"/.PKGINFO | ||
43 | fi | ||
44 | if [ -f "$dir"/.provides-pc ]; then | ||
45 | @@ -1190,11 +1192,16 @@ scan_shared_objects() { | ||
46 | done > "$controldir"/.needs-so | ||
47 | } | ||
48 | |||
49 | -# normalize a path string | ||
50 | -normalize_path() { | ||
51 | +# normalize a symlink target path (1st arg) | ||
52 | +# Converts a relative path to absolute with respect to the symlink | ||
53 | +# path (2nd arg). | ||
54 | +normalize_target_path() { | ||
55 | + local path=$1 | ||
56 | + [ "${path:0:1}" = / ] || path=$(dirname "$2")/$path | ||
57 | + | ||
58 | local oifs="$IFS" pathstr= i= | ||
59 | IFS='/' | ||
60 | - set -- $1 | ||
61 | + set -- $path | ||
62 | for i; do | ||
63 | case "$i" in | ||
64 | "."|"") continue;; | ||
65 | @@ -1217,10 +1224,7 @@ scan_symlink_targets() { | ||
66 | fi | ||
67 | |||
68 | while read symlink target; do | ||
69 | - if [ "${target#/}" = "$target" ]; then | ||
70 | - target="${symlink%/*}/$target" | ||
71 | - fi | ||
72 | - targetpath="$datadir"/$(normalize_path "$target") | ||
73 | + targetpath=$datadir$(normalize_target_path "$target" "$symlink") | ||
74 | if [ -e "$targetpath" ] || [ -L "$targetpath" ]; then | ||
75 | echo "$name=$pkgver-r$pkgrel" \ | ||
76 | >> "$d"/.symlinks-needs | ||
77 | @@ -1721,14 +1725,12 @@ builddeps() { | ||
78 | [ "$pkgname" = "${i%%[<>=]*}" ] && continue | ||
79 | subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" | ||
80 | done | ||
81 | - hostdeps="$makedepends_host" | ||
82 | - for i in $depends; do | ||
83 | + for i in $depends $makedepends_host; do | ||
84 | [ "$pkgname" = "${i%%[<>=]*}" ] && continue | ||
85 | subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i" | ||
86 | done | ||
87 | else | ||
88 | - builddeps="$makedepends" | ||
89 | - for i in $BUILD_BASE $depends; do | ||
90 | + for i in $BUILD_BASE $depends $makedepends; do | ||
91 | [ "$pkgname" = "${i%%[<>=]*}" ] && continue | ||
92 | subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" | ||
93 | done | ||
94 | @@ -1739,15 +1741,21 @@ builddeps() { | ||
95 | |||
96 | # find which deps are missing | ||
97 | for i in $builddeps; do | ||
98 | - if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then | ||
99 | - error "Conflicting package installed: ${i#\!}" | ||
100 | + if [ "${i#\!}" != "$i" ]; then | ||
101 | + if $APK info --quiet --installed "${i#\!}"; then | ||
102 | + error "Conflicting package installed: ${i#\!}" | ||
103 | + return 1 | ||
104 | + fi | ||
105 | elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then | ||
106 | missing="$missing $i" | ||
107 | fi | ||
108 | done | ||
109 | for i in $hostdeps; do | ||
110 | - if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then | ||
111 | - error "Conflicting package installed: ${i#\!}" | ||
112 | + if [ "${i#\!}" != "$i" ]; then | ||
113 | + if $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then | ||
114 | + error "Conflicting package installed: ${i#\!}" | ||
115 | + return 1 | ||
116 | + fi | ||
117 | elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then | ||
118 | missing="$missing $i" | ||
119 | fi | ||
120 | @@ -1962,9 +1970,8 @@ post_add() { | ||
121 | } | ||
122 | |||
123 | deps() { | ||
124 | - local builddeps i | ||
125 | - builddeps="$makedepends" | ||
126 | - for i in $depends; do | ||
127 | + local builddeps= i | ||
128 | + for i in $depends $makedepends; do | ||
129 | [ "$pkgname" = "${i%%[<>=]*}" ] && continue | ||
130 | subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" | ||
131 | done | ||
132 | diff --git a/functions.sh.in b/functions.sh.in | ||
133 | index e9b7280..c128e8d 100644 | ||
134 | --- a/functions.sh.in | ||
135 | +++ b/functions.sh.in | ||
136 | @@ -6,7 +6,8 @@ program=${0##*/} | ||
137 | hostspec_to_arch() { | ||
138 | case "$1" in | ||
139 | arm*-*-*-*eabi) echo "armel" ;; | ||
140 | - arm*-*-*-*eabihf) echo "armhf" ;; | ||
141 | + armv6*-*-*-*eabihf) echo "armhf" ;; | ||
142 | + armv7*-*-*-*eabihf) echo "armv7" ;; | ||
143 | i[0-9]86-*-*-*) echo "x86" ;; | ||
144 | x86_64-*-*-*) echo "x86_64" ;; | ||
145 | *) echo "unknown" ;; | ||
146 | diff --git a/newapkbuild.in b/newapkbuild.in | ||
147 | index 5ba51fb..a47dcae 100644 | ||
148 | --- a/newapkbuild.in | ||
149 | +++ b/newapkbuild.in | ||
150 | @@ -45,7 +45,6 @@ build_autotools() { | ||
151 | --prefix=/usr \\ | ||
152 | --sysconfdir=/etc \\ | ||
153 | --mandir=/usr/share/man \\ | ||
154 | - --infodir=/usr/share/info \\ | ||
155 | --localstatedir=/var \\ | ||
156 | || return 1 | ||
157 | make || return 1 | ||
158 | @@ -70,10 +69,8 @@ build_cmake() { | ||
159 | -DCMAKE_INSTALL_LIBDIR=lib \\ | ||
160 | -DBUILD_SHARED_LIBS=True \\ | ||
161 | -DCMAKE_BUILD_TYPE=Release \\ | ||
162 | - -DCMAKE_CXX_COMPILER="\${CXX:-g++}" \\ | ||
163 | - -DCMAKE_C_COMPILER="\${CC:-gcc}" \\ | ||
164 | -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\ | ||
165 | - -DCMAKE_CXX_FLAGS="\$CFLAGS" \\ | ||
166 | + -DCMAKE_C_FLAGS="\$CFLAGS" \\ | ||
167 | ${CMAKE_CROSSOPTS} \\ | ||
168 | || return 1 | ||
169 | make || return 1 | ||