Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dhtnet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
dhtnet
Commits
0a838224
Commit
0a838224
authored
1 year ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
dependencies: run pkg-static.sh
Change-Id: I5b0deff45592389c661a5816783c3d91bfc3b2a3
parent
65a6ea8c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dependencies/build.py
+3
-0
3 additions, 0 deletions
dependencies/build.py
dependencies/pkg-static.sh
+38
-0
38 additions, 0 deletions
dependencies/pkg-static.sh
with
41 additions
and
0 deletions
dependencies/build.py
+
3
−
0
View file @
0a838224
...
...
@@ -37,6 +37,7 @@ def build_and_install_opendht():
subprocess
.
run
([
"
cmake
"
,
"
.
"
,
"
-DCMAKE_INSTALL_PREFIX=
"
+
install_dir
,
"
-DCMAKE_BUILD_TYPE=Release
"
,
"
-DBUILD_SHARED_LIBS=OFF
"
,
"
-DBUILD_TESTING=OFF
"
,
"
-DOPENDHT_PYTHON=OFF
"
,
"
-DOPENDHT_TOOLS=OFF
"
,
...
...
@@ -125,6 +126,8 @@ def main():
# Build and install pjproject
build_and_install_pjproject
()
subprocess
.
run
([
f
"
for p in
{
install_dir
}
/lib/pkgconfig/*.pc; do ./pkg-static.sh $p; done
"
],
shell
=
True
,
check
=
True
)
if
__name__
==
"
__main__
"
:
main
()
This diff is collapsed.
Click to expand it.
dependencies/pkg-static.sh
0 → 100755
+
38
−
0
View file @
0a838224
#! /bin/sh
# Copyright (C) 2012 Rémi Denis-Courmont
# This file is distributed under the same license as the vlc package.
if
test
-z
"
$1
"
||
test
-n
"
$2
"
;
then
echo
"Usage:
$0
<file.pc>"
>
&2
echo
"Merges the pkg-config {Requires/Libs}.private stanza into {Requires/Libs} stanzas."
>
&2
exit
1
fi
exec
<
"
$1
"
>
"
$1
.tmp"
||
exit
$?
LIBS_PUBLIC
=
""
LIBS_PRIVATE
=
""
REQUIRES_PUBLIC
=
""
REQUIRES_PRIVATE
=
""
while
read
LINE
;
do
lpub
=
"
${
LINE
#Libs
:
}
"
lpriv
=
"
${
LINE
#Libs.private
:
}
"
rpub
=
"
${
LINE
#Requires
:
}
"
rpriv
=
"
${
LINE
#Requires.private
:
}
"
if
test
"
$lpub
"
!=
"
$LINE
"
;
then
LIBS_PUBLIC
=
"
$lpub
"
elif
test
"
$lpriv
"
!=
"
$LINE
"
;
then
LIBS_PRIVATE
=
"
$lpriv
"
elif
test
"
$rpub
"
!=
"
$LINE
"
;
then
REQUIRES_PUBLIC
=
"
$rpub
"
elif
test
"
$rpriv
"
!=
"
$LINE
"
;
then
REQUIRES_PRIVATE
=
"
$rpriv
"
else
echo
"
$LINE
"
fi
done
echo
"Libs:
$LIBS_PUBLIC
$LIBS_PRIVATE
"
echo
"Requires:
$REQUIRES_PUBLIC
$REQUIRES_PRIVATE
"
mv
-f
--
"
$1
.tmp"
"
$1
"
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