Browse Source

multiple build jobs for waf too

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 4 years ago
parent
commit
bbfb466c13
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 11 additions and 6 deletions
  1. +7
    -4
      build-qt.sh
  2. +2
    -0
      setup/env.sh
  3. +2
    -2
      setup/functions.sh

+ 7
- 4
build-qt.sh View File

@@ -203,20 +203,25 @@ qtbase_conf_args+=" -force-pkg-config"

# platform specific
if [ "${CROSS_COMPILING}" -eq 1 ]; then
if [ "${MACOS}" -eq 1 ]; then
if [ "${LINUX}" -eq 1 ]; then
qtbase_conf_args+=" -xplatform linux-g++"
elif [ "${MACOS}" -eq 1 ]; then
qtbase_conf_args+=" -xplatform macx-clang"
elif [ "${WIN32}" -eq 1 ]; then
qtbase_conf_args+=" -xplatform win32-g++"
fi
qtbase_conf_args+=" -device-option CROSS_COMPILE=${TOOLCHAIN_PREFIX_}"
else
if [ "${MACOS}" -eq 1 ]; then
if [ "${LINUX}" -eq 1 ]; then
qtbase_conf_args+=" -platform linux-g++"
elif [ "${MACOS}" -eq 1 ]; then
qtbase_conf_args+=" -platform macx-clang"
elif [ "${WIN32}" -eq 1 ]; then
qtbase_conf_args+=" -platform win32-g++"
fi
fi

# platform specific
if [ "${LINUX}" -eq 1 ]; then
qtbase_conf_args+=" -qpa xcb"
qtbase_conf_args+=" -qt-xcb"
@@ -234,8 +239,6 @@ else
qtbase_conf_args+=" -qt-zlib"
fi

echo "${qtbase_conf_args}"

download_qt qtbase
patch_file qtbase${qtsuffix} ${QT5_VERSION} "src/plugins/platforms/direct2d/direct2d.pro" 's/-lVersion/-lversion/'
build_qt_conf qtbase "${qtbase_conf_args}"


+ 2
- 0
setup/env.sh View File

@@ -112,9 +112,11 @@ TARGET_PKG_CONFIG_PATH="${PAWPAW_PREFIX}/lib/pkgconfig"
# other

MAKE_ARGS=""
WAF_ARGS=""

if which nproc > /dev/null; then
MAKE_ARGS+="-j $(nproc)"
WAF_ARGS+="-j $(nproc)"
fi

if [ "${CROSS_COMPILING}" -eq 1 ]; then


+ 2
- 2
setup/functions.sh View File

@@ -353,14 +353,14 @@ function build_waf() {

if [ ! -f "${pkgdir}/.stamp_built" ]; then
pushd "${pkgdir}"
${python} waf build
${python} waf build ${WAF_ARGS}
touch .stamp_built
popd
fi

if [ ! -f "${pkgdir}/.stamp_installed" ]; then
pushd "${pkgdir}"
${python} waf install
${python} waf install ${WAF_ARGS} -j 1
touch .stamp_installed
popd
fi


Loading…
Cancel
Save