diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-12 07:24:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-12 07:39:43 +0000 |
| commit | cc537cdb1d7fbece6d0a700831e2e0107e2d7047 (patch) | |
| tree | 093337637ab7921d26998038417bd5d2c0883da8 /main/abuild | |
| parent | 113f4b82e09d6990a9a237e219c2b5a1dc8fdd66 (diff) | |
| download | aports-cc537cdb1d7fbece6d0a700831e2e0107e2d7047.tar.bz2 aports-cc537cdb1d7fbece6d0a700831e2e0107e2d7047.tar.xz | |
main/abuild: fix check_depends_dev
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-fix-check_depends_dev.patch | 41 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 12 |
2 files changed, 49 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-fix-check_depends_dev.patch b/main/abuild/0001-abuild-fix-check_depends_dev.patch new file mode 100644 index 0000000000..028019f9c0 --- /dev/null +++ b/main/abuild/0001-abuild-fix-check_depends_dev.patch @@ -0,0 +1,41 @@ +From 62853e714521d98dead841ba954f2b9778f2ff37 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 12 Oct 2015 07:01:06 +0000 +Subject: [PATCH] abuild: fix check_depends_dev + +--- + abuild.in | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 995768a..3b6fe04 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -747,15 +747,16 @@ check_maintainer() { + } + + check_depends_dev() { +- if [ -n "$depends_dev" ]; then +- local pkgname +- for i in $pkgname $subpackages; do +- case "$pkgname" in +- *-dev) return 0 ;; +- esac +- done +- return 1 ++ if [ -z "$depends_dev" ]; then ++ return 0 + fi ++ local i ++ for i in $pkgname $subpackages; do ++ case "$i" in ++ *-dev) return 0 ;; ++ esac ++ done ++ return 1 + } + + prepare_metafiles() { +-- +2.6.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index daf7f89125..708739c237 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.24.0 _ver=${pkgver%_git*} -pkgrel=8 +pkgrel=9 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -24,6 +24,7 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-try-to-validate-maintainer-address.patch 0001-abuild-fix-issue-in-maintainer-check.patch 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch + 0001-abuild-fix-check_depends_dev.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -72,14 +73,17 @@ md5sums="7821eea872e86a768d881fecce95e934 abuild-2.24.0.tar.xz 3acc92254dbab1799f724394e1d49264 0001-abuild-fix-fetch-lock-file-on-nfs.patch 8b647dd06b617d70250bbb3680aa9f82 0001-abuild-try-to-validate-maintainer-address.patch 430baf288b197ef4b5133ac8ba392ccf 0001-abuild-fix-issue-in-maintainer-check.patch -705ad3f7a598b2d5af58981f04773fbf 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch" +705ad3f7a598b2d5af58981f04773fbf 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch +4a93183e17d80b328f85dbc193fa02e5 0001-abuild-fix-check_depends_dev.patch" sha256sums="0e0c0c7579c3b8d6668fad9d93a42f3ea18da88679e1a12a178f2676c79e94d6 abuild-2.24.0.tar.xz 3f6d6f315c0531f900d7465abaf5f4bd0bbd59d884b2af363bc0105b0f2b3a95 0001-abuild-fix-fetch-lock-file-on-nfs.patch fcbdae9a224ed4705614e6c5f220e304e405e92d0a33c5dacca0d82fcf386aec 0001-abuild-try-to-validate-maintainer-address.patch ba588472ccc0ab86e42fd2f6a0a923cd8aa400f051e8c7acbd23f4d19a3dd93f 0001-abuild-fix-issue-in-maintainer-check.patch -8601ea92162b434d281a33b7b3a6ba56caf93ec69d2d6093e8c560efe2a522cc 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch" +8601ea92162b434d281a33b7b3a6ba56caf93ec69d2d6093e8c560efe2a522cc 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch +b308cb064e67a3aef02cda92f937af4aca23a6969fcf5f611503893fd22734ee 0001-abuild-fix-check_depends_dev.patch" sha512sums="360d0164afed9c61576618d113d738327151c60f1bc1e6246fcf74f97db087ca2effb11a4ae045f1f288063d5311c6dddbe7721b3cbe65d11472b3d2b0f03ef6 abuild-2.24.0.tar.xz 620fbf17f48f2732b7e7fd10f4c02bedae6d0c5c7988cefc8e1f2f233efd49514d08b72a367203c977b11272397e713e7551029f85b0dfc79c55587551600ced 0001-abuild-fix-fetch-lock-file-on-nfs.patch cf14d49d9ac2d4dadca9687c96ae2fc9ef43c7f86e31706c942cefa508b9c075506194e87b0189970e59261072e8cd523e0ced6d4d932936adb1c2c747b14663 0001-abuild-try-to-validate-maintainer-address.patch d57fdf1c17b7b201b45bfe6f2362e212cea2a6e1ea586acc20cca301db8bc39c7bc204582d0f6827b715b6d299fc3495bc3530cd461639a3d21e93fda47d0ad9 0001-abuild-fix-issue-in-maintainer-check.patch -6b7927175dddd33e1e1b81a307f8b2b841a8c25e1467bc28dbcb894ea93caf693b1728100b587ea34830754aa30b13a165724f6261b3454c35b35aec35701e36 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch" +6b7927175dddd33e1e1b81a307f8b2b841a8c25e1467bc28dbcb894ea93caf693b1728100b587ea34830754aa30b13a165724f6261b3454c35b35aec35701e36 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch +6c14120f314804173bed97e7ce0fd125c4b28f35f21d532849778f580cda93ff898d773cee8a28cf4fbd1502c9c2f44e2d5b5a85c51a02e3e23a8338eafca0c8 0001-abuild-fix-check_depends_dev.patch" |