From f35b4ccb94575d87bc17dd0da176fc7a1a12077f Mon Sep 17 00:00:00 2001
From: thomas <kreitler@molgen.mpg.de>
Date: Thu, 21 Jul 2022 14:18:50 +0200
Subject: [PATCH] qtlinks: almost dump Qt4, unify creation of config & plugin
links
Note, bee throws a warning ...
WARNING: system and image files named '/usr/local/lib/plugins' differ
image : directory
system: symbolic link to /usr/local/qt5/lib/plugins
What is correct, so instead of update it is:
#> bee remove qtlinks-1.0.1-5.x86_64
#> bee install qtlinks-1.0.2
---
qtlinks.be0 | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/qtlinks.be0 b/qtlinks.be0
index d1392cc9a..cdf63ac86 100755
--- a/qtlinks.be0
+++ b/qtlinks.be0
@@ -1,26 +1,12 @@
#!/bin/env beesh
-# BEE_VERSION qtlinks-1.0.1-5
+# BEE_VERSION qtlinks-1.0.2-0
mee_install() {
mkdir -p $D/usr/local/bin
mkdir -p $D/usr/local/lib
mkdir $D/usr/local/lib/pkgconfig
- mkdir $D/usr/local/lib/cmake
-
- # qt4
-
- ln -s /usr/local/qt4/bin/qmake $D/usr/local/bin/qmake4
-
- for f in /usr/local/qt4/lib/pkgconfig/*.pc;do
- ln -s $f $D/usr/local/lib/pkgconfig/
- done
-
- for f in /usr/local/qt4/lib/lib*.so*;do
- ln -s $f $D/usr/local/lib/
- done
-
- # qt5
+ mkdir $D/usr/local/lib/plugins
for f in /usr/local/qt5/bin/*; do
ln -s $f $D/usr/local/bin/
@@ -30,10 +16,15 @@ mee_install() {
ln -s $f $D/usr/local/lib/
done
- ln -s /usr/local/qt5/lib/plugins $D/usr/local/lib/
+ for part in pkgconfig plugins; do
+ for f in /usr/local/qt5/lib/$part/*;do
+ ln -s $f $D/usr/local/lib/$part/
+ done
+ done
- for f in /usr/local/qt5/lib/pkgconfig/*.pc;do
- ln -s $f $D/usr/local/lib/pkgconfig/
+ # handle remaining qt4_compat libs
+ for f in /usr/local/qt4/lib/lib*.so*;do
+ ln -s $f $D/usr/local/lib/
done
# this doesn't work as the files (eg Qt5Core/Qt5CoreConfig.cmake) use expressions like