mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 04:16:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/abuild: fix gem resolver, split to subpackage

Browse Source
This commit is contained in:
Kaarle Ritvanen 2015-07-08 14:29:47 +03:00
parent 390c5e6182
commit e5e6ad428b
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main/abuild/0002-apkbuild-gem-resolver-fix-syntax.patch Normal file
View File

@ -0,0 +1,35 @@
From 1e3d4338a576a8cae81a1738ff635ec7ee4498c4 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Wed, 8 Jul 2015 12:20:46 +0300
Subject: [PATCH 2/2] apkbuild-gem-resolver: fix syntax
---
apkbuild-gem-resolver.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/apkbuild-gem-resolver.in b/apkbuild-gem-resolver.in
index 5d3951d..69f4049 100644
--- a/apkbuild-gem-resolver.in
+++ b/apkbuild-gem-resolver.in
@@ -35,8 +35,8 @@ class Aport
'ruby-io-console' => [ 'io-console', '0.4.2'] # its actually 0.4.3 but
# that version is not
# published on network
- }
- '2.2.2' = > {
+ },
+ '2.2.2' => {
'ruby-json' => ['json', '1.8.1'],
'ruby-minitest' => ['minitest', '5.4.3'],
'ruby-rake' => ['rake', '10.4.2'],
@@ -44,6 +44,7 @@ class Aport
'ruby-io-console' => [ 'io-console', '0.4.2'] # its actually 0.4.3 but
# that version is not
# published on network
+ }
}
@@aports = {}
--
2.1.0

22
main/abuild/APKBUILD
View File

@ -2,7 +2,7 @@
pkgname=abuild
pkgver=2.23.0
_ver=${pkgver%_git*}
pkgrel=2
pkgrel=3
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
@ -16,11 +16,12 @@ makedepends_build="pkgconfig"
makedepends_host="openssl-dev"
makedepends="$makedepends_host $makedepends_build"
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="apkbuild-cpan:cpan"
subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems"
options="suid"
pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
0001-abuild-fix-circular-dependency-for-symlink-deps.patch
0002-apkbuild-gem-resolver-fix-syntax.patch
"
_builddir="$srcdir/$pkgname-$_ver"
@ -57,9 +58,20 @@ cpan() {
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
}
gems() {
pkgdesc="APKBUILD dependency resolver for RubyGems"
depends="ruby ruby-augeas"
arch="noarch"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
}
md5sums="864090a6016b3424d7b6bb31e84db3f0 abuild-2.23.0.tar.xz
c8ef8f4155d445842cc20379dbe01ded 0001-abuild-fix-circular-dependency-for-symlink-deps.patch"
c8ef8f4155d445842cc20379dbe01ded 0001-abuild-fix-circular-dependency-for-symlink-deps.patch
8d96bd94711cb172586a483a089bb5c8 0002-apkbuild-gem-resolver-fix-syntax.patch"
sha256sums="4cae7d7035955d23d1f29d4d0cd00ce225b300e6e809ff240101feea97aa7262 abuild-2.23.0.tar.xz
2550d9d0dfeeb214aa0154b281a624f977d3b83ba678dc0f727f0c508996f26e 0001-abuild-fix-circular-dependency-for-symlink-deps.patch"
2550d9d0dfeeb214aa0154b281a624f977d3b83ba678dc0f727f0c508996f26e 0001-abuild-fix-circular-dependency-for-symlink-deps.patch
239c9b119ba91c254b86fcb700b48dd3f8aae7bc5e902ce04bc839d95478f6b3 0002-apkbuild-gem-resolver-fix-syntax.patch"
sha512sums="50fc7649444079e5ba5552c2f4c57dedbdcd7b10727ed7b7bec8b4c85b37bbca1d76ab61bf3ab160520634e1742c3cd91fb294371bf653330ee0047337b6dfa9 abuild-2.23.0.tar.xz
4c3d1d778b60de9f9e789501e52ab0f17ef5f2ea5cb05e33cc95d59b98130907bce5ed4c4808244b22f14c17b91682447599aded1579c904cee8cd269bda7c85 0001-abuild-fix-circular-dependency-for-symlink-deps.patch"
4c3d1d778b60de9f9e789501e52ab0f17ef5f2ea5cb05e33cc95d59b98130907bce5ed4c4808244b22f14c17b91682447599aded1579c904cee8cd269bda7c85 0001-abuild-fix-circular-dependency-for-symlink-deps.patch
ecd774c509bf45fef15d967a185d5ab7cd4e5e2736d8979b17a8f822622db799eb2a149bedb020b7e9ce0451579a6c7e36f94eaa971b0570ecd6d7adb1a7e00a 0002-apkbuild-gem-resolver-fix-syntax.patch"