summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2019-02-09 09:57:52 -0800
committerDonald Carr2019-02-09 09:57:52 -0800
commit4620eeda24d2a98ea37d4a84a8e28f3c1f46e443 (patch)
tree8ac240393d10d68b71a9a7056f5d8c90ca1b456f
parent93b0c119ee8080ce722f2d2685fe13778c6003f0 (diff)
downloadaur-4620eeda24d2a98ea37d4a84a8e28f3c1f46e443.tar.gz
Get Qt 5.12.1 to a functioning state on the tinkerboard again
-rw-r--r--PKGBUILD8
1 files changed, 6 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index a922393044d..77b3792c6eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -307,7 +307,7 @@ options=('!strip')
if ${_use_mesa}; then
_profiled_gpu_fn=qpi-mesa.sh
- _additional_configure_flags="$_additional_configure_flags -gbm"
+ _additional_configure_flags="$_additional_configure_flags -gbm -kms"
else
if $_building && ([[ -f ${__eglpkgconfigpath} ]] || [[ -f ${__glespkgconfigpath} ]]); then
echo "Mesa is about to eat our communal poodle; delete egl.pc and glesv2.pc in your sysroot"
@@ -478,7 +478,11 @@ package() {
cd "${_bindir}"
INSTALL_ROOT="$pkgdir" make install || exit 1
- find ${_installed_dir}/${pkgname}/mkspecs/modules -type f | xargs sed -i "s,${_sysroot}[^ ]*lib\(.*\).so,-l\1,g"
+ # attempt to fix Qt 5.12.1's insane complete qualification of linked libraries
+ # this still results in other sources of the complete path
+ #find ${_installed_dir}/${pkgname}/mkspecs/modules -type f | xargs sed -i "s,${_sysroot}[^ ]*lib\(.*\).so,-l\1,g"
+ # this breaks stuff as gcc does not look inside of sysroots for supposedly qualified paths
+ #find ${_installed_dir}/${pkgname}/mkspecs/modules -type f | xargs sed -i "s,${_sysroot}\([^ ]*\.so\),\1,g"
cd $(dirname $(dirname ${_installed_dir}))