snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

qt: avoid LDFLAGS leaking into mkspecs

Browse source 
Closes #3112
This commit is contained in:
Jürgen Buchmüller 2015-12-04 02:30:20 +01:00
parent 40539195ea
commit 76e4e84a9c
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/qt/template
View file

@ -1,7 +1,7 @@
# Template file for 'qt' # Template file for 'qt'
pkgname=qt pkgname=qt
version=4.8.7 version=4.8.7
revision=6 revision=7
_distname=qt-everywhere-opensource-src _distname=qt-everywhere-opensource-src
patch_args="-Np1" patch_args="-Np1"
wrksrc=${_distname}-${version} wrksrc=${_distname}-${version}
@ -24,11 +24,6 @@ makedepends="
depends="qtchooser hicolor-icon-theme" depends="qtchooser hicolor-icon-theme"
replaces="qt-qtconfig>=0" replaces="qt-qtconfig>=0"
pre_configure() {
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
}
do_configure() { do_configure() {
local _libdir local _libdir
@ -41,7 +36,10 @@ do_configure() {
_libdir=lib _libdir=lib
fi fi
./configure -confirm-license -opensource \ QMAKE_CFLAGS="${CFLAGS}" \
QMAKE_CXXFLAGS="${CXXFLAGS}" \
QMAKE_LFLAGS="${LDFLAGS}" \
./configure -confirm-license -opensource \
-prefix /usr -sysconfdir /etc -docdir /usr/share/doc/qt \ -prefix /usr -sysconfdir /etc -docdir /usr/share/doc/qt \
-plugindir /usr/${_libdir}/qt/plugins -importdir /usr/lib/qt/imports \ -plugindir /usr/${_libdir}/qt/plugins -importdir /usr/lib/qt/imports \
-translationdir /usr/share/qt/translations \ -translationdir /usr/share/qt/translations \