allow overriding job count, fixes #1054

development
Taner Sener 7 months ago
parent c46ff1f87a
commit 1a3f08faeb
  1. 4
      android.sh
  2. 11
      ios.sh
  3. 4
      linux.sh
  4. 9
      macos.sh
  5. 2
      scripts/function-android.sh
  6. 2
      scripts/function-ios.sh
  7. 2
      scripts/function-linux.sh
  8. 2
      scripts/function-macos.sh
  9. 2
      scripts/function-tvos.sh
  10. 4
      scripts/function.sh
  11. 9
      tvos.sh

@ -86,6 +86,10 @@ while [ ! $# -eq 0 ]; do
-f | --force) -f | --force)
export BUILD_FORCE="1" export BUILD_FORCE="1"
;; ;;
--jobs=*)
JOB_COUNT=$(echo $1 | sed -e 's/^--[A-Za-z]*=//g')
export BUILD_JOBS="${JOB_COUNT}"
;;
--reconf-*) --reconf-*)
CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g') CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g')

@ -28,8 +28,9 @@ if [[ -f ${XCODE_FOR_FFMPEG_KIT} ]]; then
fi fi
# DETECT IOS SDK VERSION # DETECT IOS SDK VERSION
export DETECTED_IOS_SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>>${BASEDIR}/build.log)" export DETECTED_IOS_SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>>"${BASEDIR}"/build.log)"
echo -e "\nINFO: Using SDK ${DETECTED_IOS_SDK_VERSION} by Xcode provided at $(xcode-select -p)\n" 1>>"${BASEDIR}"/build.log 2>&1 XCODE_PATH=$(xcode-select -p 2>>"${BASEDIR}"/build.log)
echo -e "\nINFO: Using SDK ${DETECTED_IOS_SDK_VERSION} by Xcode provided at ${XCODE_PATH}\n" 1>>"${BASEDIR}"/build.log 2>&1
echo -e "INFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "INFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
# SET DEFAULT BUILD OPTIONS # SET DEFAULT BUILD OPTIONS
@ -98,6 +99,10 @@ while [ ! $# -eq 0 ]; do
-f | --force) -f | --force)
export BUILD_FORCE="1" export BUILD_FORCE="1"
;; ;;
--jobs=*)
JOB_COUNT=$(echo $1 | sed -e 's/^--[A-Za-z]*=//g')
export BUILD_JOBS="${JOB_COUNT}"
;;
--reconf-*) --reconf-*)
CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g') CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g')
@ -185,7 +190,7 @@ if [[ -n ${BUILD_FULL} ]]; then
fi fi
# DISABLE SPECIFIED LIBRARIES # DISABLE SPECIFIED LIBRARIES
for disabled_library in ${disabled_libraries[@]}; do for disabled_library in "${disabled_libraries[@]}"; do
set_library "${disabled_library}" 0 set_library "${disabled_library}" 0
done done

@ -59,6 +59,10 @@ while [ ! $# -eq 0 ]; do
-f | --force) -f | --force)
export BUILD_FORCE="1" export BUILD_FORCE="1"
;; ;;
--jobs=*)
JOB_COUNT=$(echo $1 | sed -e 's/^--[A-Za-z]*=//g')
export BUILD_JOBS="${JOB_COUNT}"
;;
--reconf-*) --reconf-*)
CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g') CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g')

@ -28,8 +28,9 @@ if [[ -f ${XCODE_FOR_FFMPEG_KIT} ]]; then
fi fi
# DETECT MACOS SDK VERSION # DETECT MACOS SDK VERSION
export DETECTED_MACOS_SDK_VERSION="$(xcrun --sdk macosx --show-sdk-version 2>>${BASEDIR}/build.log)" export DETECTED_MACOS_SDK_VERSION="$(xcrun --sdk macosx --show-sdk-version 2>>"${BASEDIR}"/build.log)"
echo -e "\nINFO: Using SDK ${DETECTED_MACOS_SDK_VERSION} by Xcode provided at $(xcode-select -p)\n" 1>>"${BASEDIR}"/build.log 2>&1 XCODE_PATH=$(xcode-select -p 2>>"${BASEDIR}"/build.log)
echo -e "\nINFO: Using SDK ${DETECTED_MACOS_SDK_VERSION} by Xcode provided at ${XCODE_PATH}\n" 1>>"${BASEDIR}"/build.log 2>&1
echo -e "\nINFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "\nINFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
# SET DEFAULT BUILD OPTIONS # SET DEFAULT BUILD OPTIONS
@ -95,6 +96,10 @@ while [ ! $# -eq 0 ]; do
-f | --force) -f | --force)
export BUILD_FORCE="1" export BUILD_FORCE="1"
;; ;;
--jobs=*)
JOB_COUNT=$(echo $1 | sed -e 's/^--[A-Za-z]*=//g')
export BUILD_JOBS="${JOB_COUNT}"
;;
--reconf-*) --reconf-*)
CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g') CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g')

@ -33,7 +33,7 @@ under the prebuilt folder.\n"
echo -e "Usage: ./$COMMAND [OPTION]... [VAR=VALUE]...\n" echo -e "Usage: ./$COMMAND [OPTION]... [VAR=VALUE]...\n"
echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n"
display_help_options " -l, --lts\t\t\tbuild lts packages to support API 16+ devices\n --api-level=api\t\toverride Android api level\n --toolchain=path\t\toverride the default (llvm) toolchain path\n --no-ffmpeg-kit-protocols\tdisable custom ffmpeg-kit protocols (saf)" display_help_options " -l, --lts\t\t\tbuild lts packages to support API 16+ devices\n --jobs=N\t\t\tnumber of jobs to run [auto]\n --api-level=api\t\toverride Android api level [24]\n --toolchain=path\t\toverride the default (llvm) toolchain path\n --no-ffmpeg-kit-protocols\tdisable custom ffmpeg-kit protocols (saf) [no]"
display_help_licensing display_help_licensing
echo -e "Architectures:" echo -e "Architectures:"

@ -27,7 +27,7 @@ libraries are created under the prebuilt folder.\n"
echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Usage: ./$COMMAND [OPTION]...\n"
echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n"
display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10+ devices" " --target=ios sdk version\t\t\toverride minimum deployment target [12.1]" " --mac-catalyst-target=ios sdk version\toverride minimum deployment target for mac catalyst [14.0]" display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10+ devices\n --jobs=N\t\t\t\t\tnumber of jobs to run [auto]" " --target=ios sdk version\t\t\toverride minimum deployment target [12.1]" " --mac-catalyst-target=ios sdk version\toverride minimum deployment target for mac catalyst [14.0]"
display_help_licensing display_help_licensing
echo -e "Architectures:" echo -e "Architectures:"

@ -25,7 +25,7 @@ libraries are created under the prebuilt folder.\n"
echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Usage: ./$COMMAND [OPTION]...\n"
echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n"
display_help_options " -l, --lts\t\t\tbuild lts packages to support older devices" display_help_options " -l, --lts\t\t\tbuild lts packages to support older devices\n --jobs=N\t\t\tnumber of jobs to run [auto]"
display_help_licensing display_help_licensing
echo -e "Architectures:" echo -e "Architectures:"

@ -19,7 +19,7 @@ When compilation ends, libraries are created under the prebuilt folder.\n"
echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Usage: ./$COMMAND [OPTION]...\n"
echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n"
display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10.12+ devices" " --target=macos sdk version\toverride minimum deployment target [10.15]" display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10.12+ devices\n --jobs=N\t\t\t\tnumber of jobs to run [auto]" " --target=macos sdk version\toverride minimum deployment target [10.15]"
display_help_licensing display_help_licensing
echo -e "Architectures:" echo -e "Architectures:"

@ -20,7 +20,7 @@ set explicitly. When compilation ends, libraries are created under the prebuilt
echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Usage: ./$COMMAND [OPTION]...\n"
echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n"
display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10.0+ devices" " --target=tvos sdk version\toverride minimum deployment target [11.0]" display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10.0+ devices\n --jobs=N\t\t\tnumber of jobs to run [auto]" " --target=tvos sdk version\toverride minimum deployment target [11.0]"
display_help_licensing display_help_licensing
echo -e "Architectures:" echo -e "Architectures:"

@ -2235,7 +2235,9 @@ is_gnu_config_files_up_to_date() {
} }
get_cpu_count() { get_cpu_count() {
if [ "$(uname)" == "Darwin" ]; then if [ -n "${BUILD_JOBS}" ]; then
echo "${BUILD_JOBS}"
elif [ "$(uname)" == "Darwin" ]; then
echo $(sysctl -n hw.logicalcpu) echo $(sysctl -n hw.logicalcpu)
else else
echo $(nproc) echo $(nproc)

@ -28,8 +28,9 @@ if [[ -f ${XCODE_FOR_FFMPEG_KIT} ]]; then
fi fi
# DETECT TVOS SDK VERSION # DETECT TVOS SDK VERSION
export DETECTED_TVOS_SDK_VERSION="$(xcrun --sdk appletvos --show-sdk-version 2>>${BASEDIR}/build.log)" export DETECTED_TVOS_SDK_VERSION="$(xcrun --sdk appletvos --show-sdk-version 2>>"${BASEDIR}"/build.log)"
echo -e "\nINFO: Using SDK ${DETECTED_TVOS_SDK_VERSION} by Xcode provided at $(xcode-select -p)\n" 1>>"${BASEDIR}"/build.log 2>&1 XCODE_PATH=$(xcode-select -p 2>>"${BASEDIR}"/build.log)
echo -e "\nINFO: Using SDK ${DETECTED_TVOS_SDK_VERSION} by Xcode provided at ${XCODE_PATH}\n" 1>>"${BASEDIR}"/build.log 2>&1
echo -e "\nINFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "\nINFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
# SET DEFAULT BUILD OPTIONS # SET DEFAULT BUILD OPTIONS
@ -98,6 +99,10 @@ while [ ! $# -eq 0 ]; do
-f | --force) -f | --force)
export BUILD_FORCE="1" export BUILD_FORCE="1"
;; ;;
--jobs=*)
JOB_COUNT=$(echo $1 | sed -e 's/^--[A-Za-z]*=//g')
export BUILD_JOBS="${JOB_COUNT}"
;;
--reconf-*) --reconf-*)
CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g') CONF_LIBRARY=$(echo $1 | sed -e 's/^--[A-Za-z]*-//g')

Loading…
Cancel
Save