qt: fix loading 32bit plugins (close #2678).
This commit is contained in:
parent
56fe4ad8a7
commit
70d91717ef
1 changed files with 10 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'qt'
|
||||
pkgname=qt
|
||||
version=4.8.7
|
||||
revision=4
|
||||
revision=5
|
||||
_distname=qt-everywhere-opensource-src
|
||||
patch_args="-Np1"
|
||||
wrksrc=${_distname}-${version}
|
||||
|
@ -30,12 +30,20 @@ pre_configure() {
|
|||
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
|
||||
}
|
||||
do_configure() {
|
||||
local _libdir
|
||||
|
||||
export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
|
||||
export LD="$CXX"
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
|
||||
_libdir=lib32
|
||||
else
|
||||
_libdir=lib
|
||||
fi
|
||||
|
||||
./configure -confirm-license -opensource \
|
||||
-prefix /usr -sysconfdir /etc -docdir /usr/share/doc/qt \
|
||||
-plugindir /usr/lib/qt/plugins -importdir /usr/lib/qt/imports \
|
||||
-plugindir /usr/${_libdir}/qt/plugins -importdir /usr/lib/qt/imports \
|
||||
-translationdir /usr/share/qt/translations \
|
||||
-datadir /usr/share/qt -bindir /usr/lib/qt/bin \
|
||||
-nomake demos -nomake examples -gtkstyle \
|
||||
|
|
Loading…
Add table
Reference in a new issue