oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newapkbuild: always set makedepends in newaport

Browse Source
This commit is contained in:
Sören Tempel 2017-10-19 10:49:04 +02:00
parent 22fe641721
commit 17eb90499e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
newapkbuild.in
View File

@ -57,7 +57,6 @@ build_cmake() {
# This is incomplete: CMAKE_{HOST_,}SYSTEM_PROCESSOR needs to be set, # This is incomplete: CMAKE_{HOST_,}SYSTEM_PROCESSOR needs to be set,
# and likewise CMAKE_FIND_ROOT_PATH and a few other details. # and likewise CMAKE_FIND_ROOT_PATH and a few other details.
sed -i -e 's/^\(makedepends="\)/\1cmake /' APKBUILD
cat >>APKBUILD<<__EOF__ cat >>APKBUILD<<__EOF__
if [ "\$CBUILD" != "\$CHOST" ]; then if [ "\$CBUILD" != "\$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
@ -80,7 +79,6 @@ build_meson() {
# http://mesonbuild.com/Cross-compilation.html # http://mesonbuild.com/Cross-compilation.html
# TODO For cross compilation a cross_file needs to be created. # TODO For cross compilation a cross_file needs to be created.
sed -i -e 's/^\(makedepends="\)/\1meson /' APKBUILD
cat >>APKBUILD<<__EOF__ cat >>APKBUILD<<__EOF__
meson \\ meson \\
--prefix=/usr \\ --prefix=/usr \\
@ -174,11 +172,12 @@ newaport() {
depends="python" depends="python"
fi fi
if [ -z "$makedepends" ] &&[ "$buildtype" = "python" ]; then case "$buildtype" in
makedepends="python-dev" python) makedepends="python-dev";;
else cmake) makedepends="cmake";;
makedepends="\$depends_dev" meson) makedepends="meson";;
fi *) makedepends="\$depends_dev";;
esac
# Replace pkgver in $source # Replace pkgver in $source
if [ -n "$source" ]; then if [ -n "$source" ]; then