use build host and target host in build scripts

tanersener · Feb 24, 2020 · efe1c59 · efe1c59
1 parent 4605e77
commit efe1c59
Show file tree

Hide file tree

Showing 87 changed files with 178 additions and 176 deletions.
diff --git a/build/android-chromaprint.sh b/build/android-chromaprint.sh
@@ -28,7  28,7 @@ LIB_NAME="chromaprint"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

diff --git a/build/android-common.sh b/build/android-common.sh
@@ -75,7  75,7 @@ get_arch_name() {
     esac
 }
 
-get_target_host() {
 get_build_host() {
     case ${ARCH} in
         arm-v7a | arm-v7a-neon)
             echo "arm-linux-androideabi"
@@ -359,7  359,7 @@ get_cxxflags() {
 }
 
 get_common_linked_libraries() {
-    local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${TARGET_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${TARGET_HOST}/${API} -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib"
     local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${BUILD_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${BUILD_HOST}/${API} -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib"
 
     case $1 in
         ffmpeg)
@@ -1003,16  1003,16 @@ download_gpl_library_source() {
 set_toolchain_clang_paths() {
     export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin
 
-    TARGET_HOST=$(get_target_host)
     BUILD_HOST=$(get_build_host)
 
-    export AR=${TARGET_HOST}-ar
     export AR=${BUILD_HOST}-ar
     export CC=$(get_clang_target_host)-clang
     export CXX=$(get_clang_target_host)-clang  
 
     if [ "$1" == "x264" ]; then
         export AS=${CC}
     else
-        export AS=${TARGET_HOST}-as
         export AS=${BUILD_HOST}-as
     fi
 
     case ${ARCH} in
@@ -1021,9  1021,9 @@ set_toolchain_clang_paths() {
         ;;
     esac
 
-    export LD=${TARGET_HOST}-ld
-    export RANLIB=${TARGET_HOST}-ranlib
-    export STRIP=${TARGET_HOST}-strip
     export LD=${BUILD_HOST}-ld
     export RANLIB=${BUILD_HOST}-ranlib
     export STRIP=${BUILD_HOST}-strip
 
     export INSTALL_PKG_CONFIG_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/pkgconfig"
     export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"
@@ -1050,14  1050,14 @@ build_cpufeatures() {
 
     set_toolchain_clang_paths "cpu-features"
 
-    TARGET_HOST=$(get_target_host)
     BUILD_HOST=$(get_build_host)
     export CFLAGS=$(get_cflags "cpu-features")
     export CXXFLAGS=$(get_cxxflags "cpu-features")
     export LDFLAGS=$(get_ldflags "cpu-features")
 
     # THEN BUILD FOR THIS ABI
     $(get_clang_target_host)-clang -c ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.c -o ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
-    ${TARGET_HOST}-ar rcs ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.a ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
     ${BUILD_HOST}-ar rcs ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.a ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
     $(get_clang_target_host)-clang -shared ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o -o ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.so 1>>${BASEDIR}/build.log 2>&1
 
     create_cpufeatures_package_config
@@ -1076,13  1076,13 @@ build_android_lts_support() {
     set_toolchain_clang_paths ${LIB_NAME}
 
     # PREPARING FLAGS
-    TARGET_HOST=$(get_target_host)
     BUILD_HOST=$(get_build_host)
     CFLAGS=$(get_cflags ${LIB_NAME})
     LDFLAGS=$(get_ldflags ${LIB_NAME})
 
     # THEN BUILD FOR THIS ABI
     $(get_clang_target_host)-clang ${CFLAGS} -Wno-unused-command-line-argument -c ${BASEDIR}/android/app/src/main/cpp/android_lts_support.c -o ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o ${LDFLAGS} 1>>${BASEDIR}/build.log 2>&1
-    ${TARGET_HOST}-ar rcs ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o 1>>${BASEDIR}/build.log 2>&1
     ${BUILD_HOST}-ar rcs ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o 1>>${BASEDIR}/build.log 2>&1
 }
 
 autoreconf_library() {

diff --git a/build/android-expat.sh b/build/android-expat.sh
@@ -28,7  28,7 @@ LIB_NAME="expat"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -51,7  51,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-ffmpeg.sh b/build/android-ffmpeg.sh
@@ -34,7  34,7 @@ LIB_NAME="ffmpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -341,7  341,7 @@ rm -f ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build
 cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1
 
 ./configure \
-    --cross-prefix="${TARGET_HOST}-" \
     --cross-prefix="${BUILD_HOST}-" \
     --sysroot="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot" \
     --prefix="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
     --pkg-config="${HOST_PKG_CONFIG_PATH}" \

diff --git a/build/android-fontconfig.sh b/build/android-fontconfig.sh
@@ -28,7  28,7 @@ LIB_NAME="fontconfig"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -55,7  55,7 @@ fi
     --disable-rpath \
     --disable-libxml2 \
     --disable-docs \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-freetype.sh b/build/android-freetype.sh
@@ -28,7  28,7 @@ LIB_NAME="freetype"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -58,7  58,7 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib
     --disable-shared \
     --disable-fast-install \
     --disable-mmap \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-fribidi.sh b/build/android-fribidi.sh
@@ -28,7  28,7 @@ LIB_NAME="fribidi"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -52,7  52,7 @@ fi
     --disable-fast-install \
     --disable-debug \
     --disable-deprecated \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-giflib.sh b/build/android-giflib.sh
@@ -28,7  28,7 @@ LIB_NAME="giflib"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR"
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -50,7  50,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-gmp.sh b/build/android-gmp.sh
@@ -28,7  28,7 @@ LIB_NAME="gmp"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -51,7  51,7 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-gnutls.sh b/build/android-gnutls.sh
@@ -28,7  28,7 @@ LIB_NAME="gnutls"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 COMMON_CFLAGS=$(get_cflags ${LIB_NAME})
 COMMON_CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -83,7  83,7 @@ fi
     --disable-tests \
     --disable-tools \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-jpeg.sh b/build/android-jpeg.sh
@@ -28,7  28,7 @@ LIB_NAME="jpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})

diff --git a/build/android-kvazaar.sh b/build/android-kvazaar.sh
@@ -28,7  28,7 @@ LIB_NAME="kvazaar"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -62,7  62,7 @@ LIBS="${ARCH_SPECIFIC_LIBS}" ./configure \
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make || exit 1
 

diff --git a/build/android-lame.sh b/build/android-lame.sh
@@ -28,7  28,7 @@ LIB_NAME="lame"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -55,7  55,7 @@ fi
     --disable-frontend \
     --disable-efence \
     --disable-gtktest \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-leptonica.sh b/build/android-leptonica.sh
@@ -28,7  28,7 @@ LIB_NAME="leptonica"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export CPPFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include"
@@ -72,7  72,7 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-programs \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-libaom.sh b/build/android-libaom.sh
@@ -28,7  28,7 @@ LIB_NAME="libaom"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

diff --git a/build/android-libass.sh b/build/android-libass.sh
@@ -28,7  28,7 @@ LIB_NAME="libass"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -69,7  69,7 @@ esac
     --disable-profile \
     --disable-coretext \
     ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-libiconv.sh b/build/android-libiconv.sh
@@ -28,7  28,7 @@ LIB_NAME="libiconv"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -50,7  50,7 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-rpath \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-libilbc.sh b/build/android-libilbc.sh
@@ -28,7  28,7 @@ LIB_NAME="libilbc"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -49,7  49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-libogg.sh b/build/android-libogg.sh
@@ -28,7  28,7 @@ LIB_NAME="libogg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -49,7  49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

diff --git a/build/android-libpng.sh b/build/android-libpng.sh
@@ -28,7  28,7 @@ LIB_NAME="libpng"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
 BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -68,7  68,7 @@ fi
     --disable-unversioned-libpng-pc \
     --disable-unversioned-libpng-config \
     ${CPU_SPECIFIC_OPTIONS} \
-    --host=${TARGET_HOST} || exit 1
     --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1