From 2cac023dfc6a9006310be2ff02cd8d8b50f449e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6k=C3=A7en=20Eraslan?= Date: Sat, 21 Aug 2010 11:49:39 +0000 Subject: [PATCH] actionsapi: Add Pardus CFLAGS/CXXFLAGS as qmake parameter instead of make parameter. If we add flag parameters to make, we totally override flags instead of add them. --- pisi/actionsapi/qt4.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pisi/actionsapi/qt4.py b/pisi/actionsapi/qt4.py index bd14770c..1b5f4756 100644 --- a/pisi/actionsapi/qt4.py +++ b/pisi/actionsapi/qt4.py @@ -55,11 +55,10 @@ def configure(projectfile='', parameters='', installPrefix=prefix): if len(profiles) > 1 and projectfile == '': raise ConfigureError(_("It seems there are more than one .pro file, you must specify one. (Possible .pro files: %s)" % ", ".join(profiles))) - shelltools.system("%s -makefile %s PREFIX='%s' %s" % (qmake, projectfile, installPrefix, parameters)) + shelltools.system("%s -makefile %s PREFIX='%s' QMAKE_CFLAGS+='%s' QMAKE_CXXFLAGS+='%s' %s" % (qmake, projectfile, installPrefix, get.CFLAGS(), get.CXXFLAGS(), parameters)) def make(parameters=''): - #qmake ignores CXXFLAGS and CFLAGS environment variables #11638 - cmaketools.make('CFLAGS="%s" CXXFLAGS="%s" %s' % (get.CFLAGS(), get.CXXFLAGS(), parameters)) + cmaketools.make(parameters) def install(parameters='', argument='install'): cmaketools.install('INSTALL_ROOT="%s" %s' % (get.installDIR(), parameters), argument)