diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 9a4744ee63e..24871ede18d 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.14.2 -revision=1 +revision=2 build_style=meta wrksrc="qt-everywhere-src-${version}" hostmakedepends="cmake clang flex git glib-devel pkg-config @@ -1123,7 +1123,7 @@ qt5-qmake_package() { vmove usr/bin/qmake-qt5 # Change -isystem to -I to avoid "#include_next <stdlib.h>" errors - sed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \ + vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \ -e '/^QMAKE_CFLAGS_ISYSTEM/s;-isystem;-I;' find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \ -e 's%/usr/lib/lib\([^[:space:]]*\)\.[sa][o]*%-l\1%g' \; @@ -1132,15 +1132,15 @@ qt5-qmake_package() { # Undo changes to mkspecs/common/gcc-base.conf and g++-unix.conf if [ "$CROSS_BUILD" ]; then - sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\) ${XBPS_CFLAGS}|\1|" \ - ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf - sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\) ${XBPS_LDFLAGS}|\1|" \ - ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/g++-unix.conf + vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \ + -e "s|^\(QMAKE_CFLAGS_RELEASE.*\) ${XBPS_CFLAGS}|\1|" + vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/g++-unix.conf + -e "s|^\(QMAKE_LFLAGS_RELEASE.*\) ${XBPS_LDFLAGS}|\1|" else - sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\) ${CFLAGS}|\1|" \ - ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf - sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\) ${LDFLAGS}|\1|" \ - ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/g++-unix.conf + vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \ + -e "s|^\(QMAKE_CFLAGS_RELEASE.*\) ${CFLAGS}|\1|" + vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/g++-unix.conf\ + -e "s|^\(QMAKE_LFLAGS_RELEASE.*\) ${LDFLAGS}|\1|" fi } }