646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -94,11 +94,8 @@ def CheckWiX(context):
|
|
return result
|
|
|
|
def get_spd_module_dir():
|
|
- env = Environment()
|
|
- try:
|
|
- return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru)
|
|
- except:
|
|
- return False
|
|
+ # cannot write to ${speechd}/libexec/speech-dispatcher-modules
|
|
+ return os.path.join(os.environ["out"], "libexec/speech-dispatcher-modules")
|
|
|
|
def validate_spd_version(key,val,env):
|
|
m=re.match(r"^\d+\.\d+",val)
|
|
@@ -207,10 +204,10 @@ def create_base_env(user_vars):
|
|
env_args["LIBS"]=[]
|
|
env_args["package_name"]="RHVoice"
|
|
env_args["CPPDEFINES"]=[("RHVOICE","1")]
|
|
- env=Environment(**env_args)
|
|
- if env["dev"]:
|
|
- env["prefix"]=os.path.abspath("local")
|
|
- env["RPATH"]=env.Dir("$libdir").abspath
|
|
+ env=Environment(ENV = os.environ, **env_args)
|
|
+ env.PrependENVPath("PATH", os.environ["PATH"])
|
|
+ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
|
|
+ env["RPATH"]=env.Dir("$libdir").abspath
|
|
env["package_version"]=get_version(env["release"])
|
|
env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
|
|
if env["PLATFORM"]=="win32":
|