mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2024-12-25 00:12:19 +00:00
newapkbuild: always set makedepends in newaport
This commit is contained in:
parent
22fe641721
commit
17eb90499e
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user