summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2017-10-19 10:49:04 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2017-10-19 10:49:39 +0200
commit17eb90499ed298c09525d2c13abdfb99589962d9 (patch)
tree74cf898db62d58f463eb8706032c8eb6496e6795
parent22fe641721a8f40d603d52645890e4f9eb8ef8a6 (diff)
downloadabuild-17eb90499ed298c09525d2c13abdfb99589962d9.tar.bz2
abuild-17eb90499ed298c09525d2c13abdfb99589962d9.tar.xz
newapkbuild: always set makedepends in newaport
-rw-r--r--newapkbuild.in13
1 files changed, 6 insertions, 7 deletions
diff --git a/newapkbuild.in b/newapkbuild.in
index 5c0abf9..ade33aa 100644
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -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