diff options
-rw-r--r-- | Docs/env.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Docs/env.sh b/Docs/env.sh index 7b5aedd1d..b1b2b341c 100644 --- a/Docs/env.sh +++ b/Docs/env.sh @@ -22,7 +22,7 @@ if [ "x${TARGET_WORKSPACE}" = "x" ]; then fi if [ "x${USE_CPUS}" = "x" ]; then - NCPUS=$(grep -c "^processor" /proc/cpuinfo 2>/dev/null) + NCPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null) NCPUS="${NCPUS:-1}" NCPUS=$((NCPUS * 2)) USE_CPUS="-j${NCPUS}" @@ -55,6 +55,13 @@ NS_DEV_DEB="build-essential pkg-config git gperf" NS_TOOL_DEB="flex bison libhtml-parser-perl" NS_GTK_DEB="libgtk2.0-dev libcurl3-dev libpng-dev librsvg2-dev libjpeg-dev libmozjs185-dev" +# Haiku secondary arch suffix: +# empty for primary (gcc2 on x86), +# "_x86" for gcc4 secondary. +HA= +# Haiku packages +NS_DEV_HPKG="curl${HA}_devel libpng${HA}_devel jpeg${HA}_devel openssl${HA}_devel libiconv${HA}_devel expat${HA}_devel pkgconfig${HA} html_parser cmd:getconf" + #add target specific libraries if [ "x${TARGET_ABI}" = "xriscos" ]; then NS_FRONTEND_LIBS="${NS_FRONTEND_LIBS} ${NS_RISCOS_LIBS}" @@ -66,6 +73,12 @@ ns-apt-get-install() sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB}) } +# pkgman commandline to install necessary dev packages +ns-pkgman-install() +{ + pkgman install $(echo ${NS_DEV_HPKG}) +} + # git pull in all repos parameters are passed to git pull ns-pull() { |