Mercurial > vanilla
changeset 597:2587807b5a8f
vanilla: use make rather than ninja
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sat, 13 Jul 2019 11:23:58 +0200 |
| parents | 6972f2849a26 |
| children | f4de1c69a61a |
| files | dev/clang/clang.sh dev/lld/lld.sh dev/lldb/lldb.sh dev/llvm/llvm.sh network/openssl/openssl.sh |
| diffstat | 5 files changed, 16 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/dev/clang/clang.sh Fri Jul 12 21:00:00 2019 +0200 +++ b/dev/clang/clang.sh Sat Jul 13 11:23:58 2019 +0200 @@ -22,7 +22,7 @@ PKGSUMMARY="C language family frontend for LLVM" PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/cfe-$PKGVERSION.src.tar.xz http://releases.llvm.org/$PKGVERSION/clang-tools-extra-$PKGVERSION.src.tar.xz" -PKGDEPENDS="dev/ninja:build" +PKGDEPENDS="dev/cmake:build" PKGOPTIONS="COMPILER_RT LIBCXX LLD TOOLS" : ${CC:=clang} @@ -74,10 +74,9 @@ -DLLVM_ENABLE_RTTI=On \ $with_compiler_rt \ $with_libcxx \ - $with_lld \ - -GNinja - ninja - DESTDIR=$DESTDIR ninja install + $with_lld + make + make DESTDIR=$DESTDIR install popd popd
--- a/dev/lld/lld.sh Fri Jul 12 21:00:00 2019 +0200 +++ b/dev/lld/lld.sh Sat Jul 13 11:23:58 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MIT CUSTOM" PKGSUMMARY="LLVM's linker" PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" -PKGDEPENDS="dev/ninja:build" +PKGDEPENDS="dev/cmake:build" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -41,10 +41,9 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX= \ - -GNinja - ninja - DESTDIR=$DESTDIR ninja install + -DCMAKE_INSTALL_PREFIX= + make + make DESTDIR=$DESTDIR install popd popd
--- a/dev/lldb/lldb.sh Fri Jul 12 21:00:00 2019 +0200 +++ b/dev/lldb/lldb.sh Sat Jul 13 11:23:58 2019 +0200 @@ -43,10 +43,9 @@ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_INSTALL_PREFIX= \ -DLLVM_ENABLE_EH=On \ - -DLLVM_ENABLE_RTTI=On \ - -GNinja - ninja - DESTDIR=$DESTDIR ninja install + -DLLVM_ENABLE_RTTI=On + make + make DESTDIR=$DESTDIR install popd popd
--- a/dev/llvm/llvm.sh Fri Jul 12 21:00:00 2019 +0200 +++ b/dev/llvm/llvm.sh Sat Jul 13 11:23:58 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MIT CUSTOM" PKGSUMMARY="low level virtual machine compiler infrastructure" PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" -PKGDEPENDS="python/python compression/zlib dev/ninja:build" +PKGDEPENDS="python/python compression/zlib dev/cmake:build" PKGOPTIONS="DOXYGEN LIBCXX LLD SPHINX TARGETS" : ${CHOST:=$(uname -m)-linux-musl} @@ -82,10 +82,9 @@ $with_doxygen \ $with_libcxx \ $with_lld \ - $with_sphinx \ - -GNinja - ninja - DESTDIR=$DESTDIR ninja install + $with_sphinx + make + make DESTDIR=$DESTDIR install popd popd