diff options
author | Gonzalo Exequiel Pedone | 2019-04-15 17:19:56 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2019-04-15 17:19:56 -0300 |
commit | ca81e09d3dfd1385181d2266e710e68d9289deb7 (patch) | |
tree | 0b1f76e669046196be1e18988e4a9d94fa18cacd | |
parent | 463a8d001a5d4d37aa086375db67c0f957bff5df (diff) | |
download | aur-ca81e09d3dfd1385181d2266e710e68d9289deb7.tar.gz |
Package updated.
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rwxr-xr-x | android-env.sh | 21 |
3 files changed, 44 insertions, 32 deletions
@@ -1,16 +1,15 @@ # Generated by mksrcinfo v8 -# sáb abr 6 04:10:12 UTC 2019 +# lun abr 15 20:18:03 UTC 2019 pkgbase = android-x86-qt5 pkgdesc = Qt 5 for Android pkgver = 5.12.2 - pkgrel = 3 + pkgrel = 4 url = https://www.qt.io install = android-x86-qt5.install arch = x86_64 groups = android-qt5 license = GPL3 license = LGPL - makedepends = android-pkg-config makedepends = libgl makedepends = sqlite makedepends = zlib @@ -21,9 +20,10 @@ pkgbase = android-x86-qt5 makedepends = fontconfig depends = java-runtime-headless-openjdk<=8 depends = apache-ant - depends = android-ndk>=r18.b + depends = android-pkg-config + depends = android-ndk depends = android-platform-22 - depends = android-sdk-25.2.5 + depends = android-sdk depends = android-sdk-build-tools depends = android-sdk-platform-tools optdepends = android-google-apis-x86: AVD support @@ -10,13 +10,12 @@ source android-env.sh ${_android_arch} pkgname=android-${_android_arch}-qt5 pkgver=5.12.2 -pkgrel=3 +pkgrel=4 pkgdesc="Qt 5 for Android" arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL') -makedepends=('android-pkg-config' - 'libgl' +makedepends=('libgl' 'sqlite' 'zlib' 'python2' @@ -24,13 +23,22 @@ makedepends=('android-pkg-config' 'gperf' 'libxslt' 'fontconfig') -depends=('java-runtime-headless-openjdk<=8' - 'apache-ant' - 'android-ndk>=r18.b' - "android-platform-$ANDROID_MINIMUM_PLATFORM" - 'android-sdk-25.2.5' - 'android-sdk-build-tools' - 'android-sdk-platform-tools') + +if [ -z "${ANDROID_NO_DEPS}" ]; then + depends=('java-runtime-headless-openjdk<=8' + 'apache-ant' + 'android-pkg-config' + 'android-ndk' + "android-platform-$ANDROID_MINIMUM_PLATFORM" + 'android-sdk' + 'android-sdk-build-tools' + 'android-sdk-platform-tools') +else + depends=('java-runtime-headless-openjdk<=8' + 'apache-ant' + 'android-pkg-config') +fi + groups=('android-qt5') case "$_android_arch" in @@ -66,6 +74,7 @@ md5sums=('99c2eb46e533371798b4ca2d1458e065' prepare() { cd ${_pkgfqn} + check_ndk_version_ge_than 18.0 # Platform specific patches. @@ -117,8 +126,8 @@ build() { -xplatform android-clang -nomake tests -nomake examples - -android-ndk ${ANDROID_NDK_ROOT} - -android-sdk ${ANDROID_SDK_ROOT} + -android-sdk ${ANDROID_HOME} + -android-ndk ${ANDROID_NDK_HOME} -android-ndk-host linux-x86_64 -android-toolchain-version 4.9 -skip qttranslations @@ -153,11 +162,11 @@ package() { cd ${_pkgfqn} make INSTALL_ROOT=${pkgdir} install - STRIP=${ANDROID_NDK_ROOT}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip - find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; -# find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + STRIP=${ANDROID_NDK_HOME}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip + find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip -s {} \; + find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \; +# find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} -g {} \; + find ${pkgdir}/${ANDROID_LIBS}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \; + find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \; sed -i '/QMAKE_PRL_BUILD_DIR/d' ${pkgdir}/${ANDROID_LIBS}/lib/lib*.prl } diff --git a/android-env.sh b/android-env.sh index f967d7dcd35c..3549d530bb13 100755 --- a/android-env.sh +++ b/android-env.sh @@ -17,12 +17,12 @@ if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then export ANDROID_MINIMUM_PLATFORM=22 fi -if [ -z "${ANDROID_NDK_ROOT}" ]; then - export ANDROID_NDK_ROOT=/opt/android-ndk +if [ -z "${ANDROID_HOME}" ]; then + export ANDROID_HOME=/opt/android-sdk fi -if [ -z "${ANDROID_SDK_ROOT}" ]; then - export ANDROID_SDK_ROOT=/opt/android-sdk +if [ -z "${ANDROID_NDK_HOME}" ]; then + export ANDROID_NDK_HOME=/opt/android-ndk fi get_last() { @@ -30,7 +30,7 @@ get_last() { } if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then - export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools) + export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools) fi if [ -z "${ANDROID_API_VERSION}" ]; then @@ -41,8 +41,8 @@ if [ -z "${ANDROID_NDK_PLATFORM}" ]; then export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM fi -export ANDROID_PLATFORM=${ANDROID_NDK_ROOT}/platforms/$ANDROID_NDK_PLATFORM -export ANDROID_TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64 +export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM +export ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64 export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin/ export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config @@ -69,6 +69,7 @@ esac export ANDROID_CC=${ANDROID_TOOLS_COMPILER_PREFIX}clang export ANDROID_CXX=${ANDROID_TOOLS_COMPILER_PREFIX}clang++ export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar +export ANDROID_AS=${ANDROID_TOOLS_PREFIX}as export ANDROID_NM=${ANDROID_TOOLS_PREFIX}nm export ANDROID_RANLIB=${ANDROID_TOOLS_PREFIX}ranlib export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip @@ -77,10 +78,10 @@ export PKG_CONFIG_SYSROOT_DIR=${ANDROID_LIBS} export PKG_CONFIG_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig ndk_version() { - grep 'Pkg.Revision' ${ANDROID_NDK_ROOT}/source.properties | awk '{print $3}' + grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}' } -ndk_version_ge_than() { +check_ndk_version_ge_than() { version=$1 ndk_ver=$(ndk_version) @@ -91,6 +92,8 @@ ndk_version_ge_than() { older_ver=$(printf "${version}\n${ndk_ver}" | sort -V | head -n 1) if [ "${older_ver}" = "${ndk_ver}" ]; then + echo "ERROR: NDK version >= $version required." + return 1 fi |