summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-04-06 01:13:52 -0300
committerGonzalo Exequiel Pedone2019-04-06 01:13:52 -0300
commit463a8d001a5d4d37aa086375db67c0f957bff5df (patch)
tree941dbf6ca5ad549f101e3960bd77766aee31bacc
parent95903713fa126b654b43df2ee6221c1531c05494 (diff)
downloadaur-463a8d001a5d4d37aa086375db67c0f957bff5df.tar.gz
Fixed pkg-config support.
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-clang-build.patch8
-rw-r--r--PKGBUILD4
-rwxr-xr-xandroid-env.sh25
4 files changed, 38 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8771a983340..e8ef52aaec7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# vie abr 5 04:50:33 UTC 2019
+# sáb abr 6 04:10:12 UTC 2019
pkgbase = android-x86-qt5
pkgdesc = Qt 5 for Android
pkgver = 5.12.2
- pkgrel = 2
+ pkgrel = 3
url = https://www.qt.io
install = android-x86-qt5.install
arch = x86_64
@@ -36,7 +36,7 @@ pkgbase = android-x86-qt5
source = 0001-Fix-clang-build.patch
source = 0002-Disable-mapbox.patch
md5sums = 99c2eb46e533371798b4ca2d1458e065
- md5sums = ba4ff94ed5a0aa9746396cb0af6f0865
+ md5sums = 0b19ddef193baddb656d3170635e6de6
md5sums = 20d8bdd24102e9011b561b7361394728
pkgname = android-x86-qt5
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
index 72f52ac0056..4c243137015 100644
--- a/0001-Fix-clang-build.patch
+++ b/0001-Fix-clang-build.patch
@@ -14,3 +14,11 @@
+ -isystem $$NDK_ROOT/sysroot/usr/include
ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
+
+@@ -54,3 +54,6 @@
+ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
+
+ include(../common/android-base-tail.conf)
++
++QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX]
++QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config
diff --git a/PKGBUILD b/PKGBUILD
index 6918793cc87..e831e461d0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ source android-env.sh ${_android_arch}
pkgname=android-${_android_arch}-qt5
pkgver=5.12.2
-pkgrel=2
+pkgrel=3
pkgdesc="Qt 5 for Android"
arch=('x86_64')
url='https://www.qt.io'
@@ -61,7 +61,7 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
"0001-Fix-clang-build.patch"
"0002-Disable-mapbox.patch")
md5sums=('99c2eb46e533371798b4ca2d1458e065'
- 'ba4ff94ed5a0aa9746396cb0af6f0865'
+ '0b19ddef193baddb656d3170635e6de6'
'20d8bdd24102e9011b561b7361394728')
prepare() {
diff --git a/android-env.sh b/android-env.sh
index d9f6b78ecbb..f967d7dcd35 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -6,6 +6,10 @@
_android_arch=$1
+if [ -z "${_android_arch}" ]; then
+ _android_arch=armv7a-eabi
+fi
+
# Minimum Android platform based on:
#
# https://developer.android.com/about/dashboards/
@@ -71,3 +75,24 @@ export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
export ANDROID_LIBS=/opt/android-libs/${_android_arch}
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}'
+}
+
+ndk_version_ge_than() {
+ version=$1
+ ndk_ver=$(ndk_version)
+
+ if [ "${version}" = "${ndk_ver}" ]; then
+ return 0
+ fi
+
+ older_ver=$(printf "${version}\n${ndk_ver}" | sort -V | head -n 1)
+
+ if [ "${older_ver}" = "${ndk_ver}" ]; then
+ return 1
+ fi
+
+ return 0
+}