From df139dc117bf8121cd89881ec695faa4387c7599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 21 Aug 2015 11:48:20 +0200 Subject: [PATCH] qtcreator: Use new build-style qmake --- srcpkgs/qtcreator/template | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 9af32aeb88..73b3772615 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,12 +1,10 @@ # Template file for 'qtcreator' pkgname=qtcreator version=3.5.0 -revision=3 +revision=4 wrksrc=qt-creator-opensource-src-${version} -build_style=gnu-makefile +build_style=qmake build_pie=yes -make_build_args="INSTALL_ROOT=\${DESTDIR}/usr" -make_install_args="${make_build_args}" hostmakedepends="perl python pkg-config" makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel" depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite" @@ -18,12 +16,6 @@ homepage="http://wiki.qt.io/Category:Tools::QtCreator" distfiles="http://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.gz" checksum=5dc35f81b50d65243a6ae046125061051d03c3d50937a37e29e0669384bb0eb6 -# Currently fails with parallel build :/ -# disable_parallel_build=yes - -do_configure() { - qmake QMAKE_LFLAGS_SHLIB+=" -Wl,-z,now" QMAKE_LFLAGS_PLUGIN+=" -Wl,-z,now" -} do_build() { # Note: A simple "make ${makejobs}" fails after libs because # of files being removed and symlinked asynchronously.