Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
abuild
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Adélie Linux
abuild
Commits
41343329
Commit
41343329
authored
Jul 27, 2016
by
Timo Teräs
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abuild: fix dependency tracing for cross builds
parent
495dac7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
abuild.in
abuild.in
+15
-8
No files found.
abuild.in
View file @
41343329
...
...
@@ -1026,7 +1026,14 @@ subpkg_provides_pc() {
trace_apk_deps
()
{
local
name
=
"$1"
local
dir
=
"$2"
local
parch
=
"$3"
local
i
=
found
=
autodeps
=
deppkgs
=
missing
=
local
apkroot
=
case
"$parch"
in
$
CBUILD_ARCH
)
;;
$
CARCH
|
$
CTARGET_ARCH
)
apkroot
=
"--root $CBUILDROOT"
;;
esac
msg
"Tracing dependencies..."
#
add
pkgconfig
if
usr
/
lib
/
pkgconfig
is
found
...
...
@@ -1049,8 +1056,8 @@ trace_apk_deps() {
if
subpkg_provides_prefixed_so
"$i"
;
then
autodeps
=
"$autodeps so:$sonameprefix$i"
elif
subpkg_provides_so
"$i"
||
cross_compiling
\
||
$
APK
info
--
quiet
--
installed
"so:$i"
;
then
elif
subpkg_provides_so
"$i"
\
||
$
APK
$
apkroot
info
--
quiet
--
installed
"so:$i"
;
then
autodeps
=
"$autodeps so:$i"
else
missing
=
"$missing $i"
...
...
@@ -1061,7 +1068,7 @@ trace_apk_deps() {
if
[
-
f
"$dir"
/.
rpaths
];
then
local
so_files
=$(
find_so_files
"$dir"
/.
rpaths
$
missing
)
\
||
return
1
deppkgs
=$($
APK
info
--
quiet
--
who
-
owns
$
so_files
)
||
return
1
deppkgs
=$($
APK
$
apkroot
info
--
quiet
--
who
-
owns
$
so_files
)
||
return
1
fi
for
found
in
$
deppkgs
;
do
...
...
@@ -1079,9 +1086,9 @@ trace_apk_deps() {
#
pkg
-
config
depends
for
i
in
$(
sort
-
u
"$dir"
/.
needs
-
pc
2
>/
dev
/
null
);
do
if
subpkg_provides_pc
"$i"
||
cross_compiling
\
||
$
APK
info
--
quiet
--
installed
"pc:$i"
;
then
local
provider
=$(
apk
search
--
quiet
"pc:$i"
)
if
subpkg_provides_pc
"$i"
\
||
$
APK
$
apkroot
info
--
quiet
--
installed
"pc:$i"
;
then
local
provider
=$(
apk
$
apkroot
search
--
quiet
"pc:$i"
)
if
list_has
"$provider"
$
depends_dev
;
then
warning
"$provider should be removed from depends_dev"
fi
...
...
@@ -1090,7 +1097,7 @@ trace_apk_deps() {
warning
"Could not find any provider for pc:$i"
local
pcfile
=/
usr
/
lib
/
pkgconfig
/
"${i%%[<>=]*}"
.
pc
if
[
-
e
"$pcfile"
];
then
local
owner
=$($
APK
info
--
quiet
--
who
-
owns
$
pcfile
)
local
owner
=$($
APK
$
apkroot
info
--
quiet
--
who
-
owns
$
pcfile
)
warning
"${owner:-package providing $pcfile} needs to be rebuilt"
fi
fi
...
...
@@ -1310,7 +1317,7 @@ create_apks() {
local
subpkgname
=$
name
local
subpkgarch
=$(
pkginfo_val
arch
$
file
)
trace_apk_deps
"$name"
"$dir"
||
return
1
trace_apk_deps
"$name"
"$dir"
"$subpkgarch"
||
return
1
msg
"Package size: ${size}"
msg
"Compressing data..."
(
...
...
A. Wilcox
@awilfox
mentioned in commit
9f703d32
·
Feb 27, 2020
mentioned in commit
9f703d32
mentioned in commit 9f703d3222a6a8d52ac560035fb1a988d2f9bff7
Toggle commit list
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