From 17eb90499ed298c09525d2c13abdfb99589962d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Thu, 19 Oct 2017 10:49:04 +0200
Subject: newapkbuild: always set makedepends in newaport

---
 newapkbuild.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'newapkbuild.in')

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
-- 
cgit v1.2.3