Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actionsapi: Add Pardus CFLAGS/CXXFLAGS as qmake parameter instead of make parameter.

Browse Source 
If we add flag parameters to make, we totally override flags instead of add them.
This commit is contained in:
Gökçen Eraslan
2010-08-21 11:49:39 +00:00
parent f82b0b5998
commit 2cac023dfc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/actionsapi/qt4.py
+2 -3
View File
@@ -55,11 +55,10 @@ def configure(projectfile='', parameters='', installPrefix=prefix):
if len(profiles) > 1 and projectfile == '': 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))) 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=''): def make(parameters=''):
#qmake ignores CXXFLAGS and CFLAGS environment variables #11638 cmaketools.make(parameters)
cmaketools.make('CFLAGS="%s" CXXFLAGS="%s" %s' % (get.CFLAGS(), get.CXXFLAGS(), parameters))
def install(parameters='', argument='install'): def install(parameters='', argument='install'):
cmaketools.install('INSTALL_ROOT="%s" %s' % (get.installDIR(), parameters), argument) cmaketools.install('INSTALL_ROOT="%s" %s' % (get.installDIR(), parameters), argument)