Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakub Panek
aports
Commits
28b7f5d2
Commit
28b7f5d2
authored
15 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
abuild: add pkgconfig to depends if needed. misc fixes
parent
53b17143
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
abuild.in
+19
-1
19 additions, 1 deletion
abuild.in
with
19 additions
and
1 deletion
abuild.in
+
19
−
1
View file @
28b7f5d2
...
@@ -427,6 +427,12 @@ trace_apk_deps() {
...
@@ -427,6 +427,12 @@ trace_apk_deps() {
for
i
in
$autodeps
;
do
for
i
in
$autodeps
;
do
echo
"depend =
$i
"
>>
"
$dir
"
/.PKGINFO
echo
"depend =
$i
"
>>
"
$dir
"
/.PKGINFO
done
done
# add pkgconfig if usr/lib/pkgconfig is found
if
[
-d
"
$pkgbasdir
"
/
$name
/usr/lib/pkgconfig
]
\
&&
!
grep
-q
'^depend = pkgconfig'
"
$dir
"
/.PKGINFO
;
then
msg
"Added pkgconfig as dependency"
echo
"depend = pkgconfig"
>>
"
$dir
"
/.PKGINFO
fi
}
}
create_apks
()
{
create_apks
()
{
...
@@ -443,7 +449,12 @@ create_apks() {
...
@@ -443,7 +449,12 @@ create_apks() {
(
(
cd
"
$datadir
"
cd
"
$datadir
"
# data.tar.gz
# data.tar.gz
tar
-c
.
| abuild-tar
--hash
|
gzip
-9
>
"
$dir
"
/data.tar.gz
set
--
*
if
[
"
$1
"
=
'*'
]
;
then
touch
.dummy
set
--
.dummy
fi
tar
-c
"
$@
"
| abuild-tar
--hash
|
gzip
-9
>
"
$dir
"
/data.tar.gz
# append the hash for data.tar.gz
# append the hash for data.tar.gz
local
sha256
=
$(
sha256sum
"
$dir
"
/data.tar.gz |
cut
-f1
-d
' '
)
local
sha256
=
$(
sha256sum
"
$dir
"
/data.tar.gz |
cut
-f1
-d
' '
)
...
@@ -727,6 +738,13 @@ builddeps() {
...
@@ -727,6 +738,13 @@ builddeps() {
fi
fi
[
-z
"
$recursive
"
]
&&
return
1
[
-z
"
$recursive
"
]
&&
return
1
# find dependencies that are installed but missing in repo.
for
i
in
$deps
;
do
if
[
-z
"
$(
apk search
--repo
"
$apkcache
"
$i
)
"
]
;
then
missing
=
"
$missing
$i
"
fi
done
for
i
in
$(
deptrace
$missing
)
;
do
for
i
in
$(
deptrace
$missing
)
;
do
# i = pkg:dir
# i = pkg:dir
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment