ffmpeg-6: fix COMPONENT_REVISION
[oi-userland.git] / components / sysutils / virtualbox / patches / 24-qt-rpath.patch
blobeb809c611e1938998173d34cbefd645b430d5f9d
1 UICommon.so needs the rpath for Qt5 libs too
3 --- VirtualBox-7.0.18/Config.kmk.orig
4 +++ VirtualBox-7.0.18/Config.kmk
5 @@ -7932,7 +7932,7 @@
6 /usr/local/lib
7 endif
8 ifeq ($(KBUILD_TARGET),solaris)
9 - TEMPLATE_VBoxQtGuiExe_LDFLAGS.solaris = -Wl,-z,ignore # Same as VBOX_LD_as_needed.
10 + TEMPLATE_VBoxQtGuiExe_LDFLAGS.solaris = -Wl,-z,ignore '$(VBOX_GCC_RPATH_OPT)$(VBOX_PATH_QT_LIB)' # Same as VBOX_LD_as_needed.
11 TEMPLATE_VBoxQtGuiExe_LIBS += \
12 rt socket nsl
13 endif
14 diff --git a/configure b/configure
15 index c1c2965..82c9971 100755
16 --- a/configure
17 +++ b/configure
18 @@ -1699,7 +1699,8 @@ EOF
19 # store only the first path, remove all other paths
20 # most likely pkg-config gave us -I/usr/include/qt6 -I/usr/include/qt6/QtCore
21 INCQT6=`echo "$INCQT6"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'`
22 - cnf_append "VBOX_PATH_QT_LIB" "`strip_L "$LIBQT6"`"
23 + # This is not quite right since the qt libpath does not have to be first but only one entry works...
24 + cnf_append "VBOX_PATH_QT_LIB" '$'"(firstword `strip_L "$LIBQT6"`)"
25 cnf_append "PATH_SDK_QT6_INC" "$INCQT6"
26 # This is not quite right since the qt libpath does not have to be first...
27 cnf_append "PATH_SDK_QT6_LIB" '$'"(firstword `strip_L "$LIBQT6"`)"