TYPO corrected, no need to intermediate variables like host, flags = glb.flags removed
This commit is contained in:
@@ -19,7 +19,6 @@ from variables import glb
|
|||||||
|
|
||||||
env = glb.env
|
env = glb.env
|
||||||
dirs = glb.dirs
|
dirs = glb.dirs
|
||||||
flags = glb.flags
|
|
||||||
|
|
||||||
def pkgDIR():
|
def pkgDIR():
|
||||||
return env.pkg_dir
|
return env.pkg_dir
|
||||||
|
|||||||
@@ -26,17 +26,16 @@ def exportFlags():
|
|||||||
# Build systems depend on these environment variables. That is why
|
# Build systems depend on these environment variables. That is why
|
||||||
# we export them instead of using as (instance) variables.
|
# we export them instead of using as (instance) variables.
|
||||||
values = pisi.config.config.values
|
values = pisi.config.config.values
|
||||||
environ['HOST'] = host = values.build.host
|
environ['HOST'] = values.build.host
|
||||||
environ['CFLAGS'] = cflags = values.build.cflags
|
environ['CFLAGS'] = values.build.cflags
|
||||||
environ['CXXFLAGS'] = cxxflags = values.build.cxxflags
|
environ['CXXFLAGS'] = values.build.cxxflags
|
||||||
environ['LDFLAGS'] = ldflags = values.build.ldflags
|
environ['LDFLAGS'] = values.build.ldflags
|
||||||
|
|
||||||
|
|
||||||
class Env(object):
|
class Env(object):
|
||||||
'''General environment variables used in actions API'''
|
'''General environment variables used in actions API'''
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
|
||||||
setFlags()
|
exportFlags()
|
||||||
|
|
||||||
self.__vars = {
|
self.__vars = {
|
||||||
'pkg_dir': 'PKG_DIR',
|
'pkg_dir': 'PKG_DIR',
|
||||||
@@ -73,7 +72,6 @@ class Dirs:
|
|||||||
localstate = 'var/lib'
|
localstate = 'var/lib'
|
||||||
defaultprefix = 'usr'
|
defaultprefix = 'usr'
|
||||||
|
|
||||||
|
|
||||||
class Variables(pisi.config.Config):
|
class Variables(pisi.config.Config):
|
||||||
const = pisi.constants.const
|
const = pisi.constants.const
|
||||||
env = Env()
|
env = Env()
|
||||||
|
|||||||
Reference in New Issue
Block a user