diff --git a/pisi/actionsapi/actionglobals.py b/pisi/actionsapi/actionglobals.py index 78d49457..b47c2b78 100644 --- a/pisi/actionsapi/actionglobals.py +++ b/pisi/actionsapi/actionglobals.py @@ -50,9 +50,10 @@ class Dirs: class Flags: """General flags used in actions API""" values = pisi.config.config.values - environ["HOST"] = host = values.build.host - environ["CFLAGS"] = cflags = values.build.cflags - environ["CXXLAGS"] = cxxflags = values.build.cflags + host = values.build.host + cflags = values.build.cflags + cxxflags = values.build.cxxflags + ldflags = values.build.ldflags class ActionGlobals(pisi.config.Config): const = pisi.constants.const diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py new file mode 100644 index 00000000..75f85d7c --- /dev/null +++ b/pisi/actionsapi/get.py @@ -0,0 +1,38 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +from actionglobals import glb + +env = glb.env +dirs = glb.dirs +flags = glb.flags + +def pkgDIR(): + return env.pkg_dir + +def workDIR(): + return env.work_dir + +def installDIR(): + return env.install_dir + +def srcNAME(): + return env.src_name + +def srcVERSION(): + return env.src_version + +def srcRELEASE(): + return env.src_release + +def HOST(): + return flags.host + +def CFLAGS(): + return flags.cflags + +def CXXFLAGS(): + return flags.cxxflags + +def LDFLAGS(): + return flags.ldflags diff --git a/pisi/configfile.py b/pisi/configfile.py index 8703f1d0..15fb5817 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -17,6 +17,7 @@ #host = i686-pc-linux-gnu #CFLAGS= -mcpu=i686 -O2 -pipe -fomit-frame-pointer #CXXFLAGS= -mcpu=i686 -O2 -pipe -fomit-frame-pointer +#LDFLAGS= # #[dirs] #lib_dir = /var/lib/pisi @@ -47,7 +48,8 @@ class BuildDefaults: """Default values for [build] section""" host = "i686-pc-linux-gnu" CFLAGS = "-mcpu=i686 -O2 -pipe -fomit-frame-pointer" - CXXFLAGS= "-mcpu=i686 -O2 -pipe -fomit-frame-pointer" + CXXFLAGS = "-mcpu=i686 -O2 -pipe -fomit-frame-pointer" + LDFLAGS = "" class DirsDefaults: "Default values for [directories] section"