Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
642
Issues
642
List
Boards
Labels
Service Desk
Milestones
Merge Requests
195
Merge Requests
195
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
2229e08b
Commit
2229e08b
authored
Jun 16, 2010
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/abuild: backport bugfix for versioned deps
parent
30389111
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
3 deletions
+62
-3
main/abuild/APKBUILD
main/abuild/APKBUILD
+5
-3
main/abuild/versioned-deps.patch
main/abuild/versioned-deps.patch
+57
-0
No files found.
main/abuild/APKBUILD
View file @
2229e08b
...
...
@@ -2,9 +2,10 @@
pkgdesc
=
"Script to build Alpine Packages"
pkgname
=
abuild
pkgver
=
2.1
pkgrel
=
0
pkgrel
=
1
url
=
http://git.alpinelinux.org/cgit/abuild/
source
=
"http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-
$pkgver
.tar.bz2
versioned-deps.patch
"
depends
=
"fakeroot file sudo pax-utils openssl apk-tools"
makedepends
=
"openssl-dev pkgconfig"
...
...
@@ -12,10 +13,11 @@ license=GPL-2
build
()
{
cd
"
$srcdir
/
$pkgname
-
$pkgver
"
patch
-p1
-i
"
$srcdir
"
/versioned-deps.patch
||
return
1
make
make
install
DESTDIR
=
"
$pkgdir
"
install
-m
644 abuild.conf
"
$pkgdir
"
/etc/abuild.conf
}
md5sums
=
"2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2"
md5sums
=
"2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2
9fb2ff2f601a558065f4524c45a94997 versioned-deps.patch"
main/abuild/versioned-deps.patch
0 → 100644
View file @
2229e08b
commit 463a87812523b004b94dc56b8edf90d1ed5d1ee0
Author: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu May 6 18:31:36 2010 +0000
abuild: bugfix for versioned dependencies
we need strip all '<>=' chars not only last
diff --git a/abuild.in b/abuild.in
index e0d726b..2af45e7 100755
--- a/abuild.in
+++ b/abuild.in
@@ -726,7 +726,7 @@
depparse_aports() {
case "$j" in
!*) continue;;
esac
- deps="$deps ${j%[<>=]*}"
+ deps="$deps ${j%%[<>=]*}"
done
for j in $pkgname $subpackages; do
echo "o ${j%%:*} $dir"
@@ -747,7 +747,7 @@
deptrace() {
local deps= i=
# strip versions from deps
for i in "$@"; do
- deps="$deps ${i%[<>=]*}"
+ deps="$deps ${i%%[<>=]*}"
done
[ -z "$deps" ] && return 0
( depparse_aports
@@ -789,7 +789,7 @@
builddeps() {
# add depends unless it is a subpackage
for i in $depends; do
- subpackages_has ${i%[<>=]*} || deps="$deps $i"
+ subpackages_has ${i%%[<>=]*} || deps="$deps $i"
done
installed_deps=$(apk info -e $deps)
@@ -820,7 +820,7 @@
builddeps() {
# find dependencies that are installed but missing in repo.
for i in $deps; do
- local m=$(apk search --repository "$apkcache" ${i%[<>=]*})
+ local m=$(apk search --repository "$apkcache" ${i%%[<>=]*})
if [ -z "$m" ]; then
missing="$missing $i"
fi
@@ -903,7 +903,7 @@
deplist_has() {
local i
shift
for i in $@; do
- i=${i%[<>=]*}
+ i=${i%%[<>=]*}
[ "$needle" = "$i" ] && return 0
[ "$needle" = "!$i" ] && return 1
done
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment