blob: 30ce52ebbbf4040249ad70d74b808f9c53684fcb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.3 2022/05/03 20:03:31 nia Exp $
Don't strip environment so pkgsrc settings survive.
--- BuildTools/SCons/SConstruct.orig 2018-04-06 10:06:45.000000000 +0000
+++ BuildTools/SCons/SConstruct
@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["P
gconf_env = conf_env.Clone()
conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
if conf.CheckPKG("gconf-2.0") :
- gconf_bare_env = Environment()
+ gconf_bare_env = Environment(ENV=os.environ)
gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]
|
