mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
16 lines
675 B
Plaintext
16 lines
675 B
Plaintext
$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.2 2016/03/01 13:25:01 wiz Exp $
|
|
|
|
Don't strip environment so pkgsrc settings survive.
|
|
|
|
--- BuildTools/SCons/SConstruct.orig 2014-12-11 23:38:09.000000000 +0000
|
|
+++ BuildTools/SCons/SConstruct
|
|
@@ -194,7 +194,7 @@ if env["PLATFORM"] != "win32" 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')
|
|
gconf_flags = {
|
|
"LIBS": gconf_bare_env["LIBS"],
|