Commit 17eb9049 authored by Sören Tempel's avatar Sören Tempel

newapkbuild: always set makedepends in newaport

parent 22fe6417
......@@ -57,7 +57,6 @@ build_cmake() {
# This is incomplete: CMAKE_{HOST_,}SYSTEM_PROCESSOR needs to be set,
# and likewise CMAKE_FIND_ROOT_PATH and a few other details.
sed -i -e 's/^\(makedepends="\)/\1cmake /' APKBUILD
cat >>APKBUILD<<__EOF__
if [ "\$CBUILD" != "\$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
......@@ -80,7 +79,6 @@ build_meson() {
# http://mesonbuild.com/Cross-compilation.html
# TODO For cross compilation a cross_file needs to be created.
sed -i -e 's/^\(makedepends="\)/\1meson /' APKBUILD
cat >>APKBUILD<<__EOF__
meson \\
--prefix=/usr \\
......@@ -174,11 +172,12 @@ newaport() {
depends="python"
fi
if [ -z "$makedepends" ] &&[ "$buildtype" = "python" ]; then
makedepends="python-dev"
else
makedepends="\$depends_dev"
fi
case "$buildtype" in
python) makedepends="python-dev";;
cmake) makedepends="cmake";;
meson) makedepends="meson";;
*) makedepends="\$depends_dev";;
esac
# Replace pkgver in $source
if [ -n "$source" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment