kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Preserve environment.

Browse source
This commit is contained in:
joerg 2014-12-12 10:50:49 +00:00
parent f86268b244
commit c8c0f3c551
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chat/swift/distinfo
View file

@ -1,8 +1,10 @@
$NetBSD: distinfo,v 1.2 2014/09/19 07:05:24 wiz Exp $
$NetBSD: distinfo,v 1.3 2014/12/12 10:50:49 joerg Exp $
SHA1 (swift-2.0.tar.gz) = b04ba098fffb1edc2ef0215957371c249458f0be
RMD160 (swift-2.0.tar.gz) = f1e8f38e650a3178e236ec8d6f3cb97fecb4910d
Size (swift-2.0.tar.gz) = 8816954 bytes
SHA1 (patch-BuildTools_SCons_SConscript.boot) = dadfab9a521d9ef1c1e5de0a8bec080d0a7b3e63
SHA1 (patch-BuildTools_SCons_SConstruct) = 3a6bc4e3a931c8fa0e299edac65c3e8101f661bc
SHA1 (patch-BuildTools_SCons_Tools_qt4.py) = 9c1f20a0dae15f73db02bbfe0d11e077176f2fcc
SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp) = 1bb39d5b89bbd0d1d77c8cda7db55c3fbec066b8
SHA1 (patch-Swiften_EventLoop_EventLoop.cpp) = a840ad43cd5082c3f511c6efd1a49e910c3fb6ea

16
chat/swift/patches/patch-BuildTools_SCons_SConscript.boot Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.1 2014/12/12 10:50:49 joerg Exp $
--- BuildTools/SCons/SConscript.boot.orig 2014-12-11 23:47:38.000000000 +0000
+++ BuildTools/SCons/SConscript.boot
@@ -65,10 +65,7 @@ vars.Add(BoolVariable("set_iterator_debu
# Set up default build & configure environment
################################################################################
-env_ENV = {
- 'PATH' : os.environ['PATH'],
- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
-}
+env_ENV = os.environ
if "MSVC_VERSION" in ARGUMENTS :
env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"])
else :

13
chat/swift/patches/patch-BuildTools_SCons_SConstruct Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.1 2014/12/12 10:50:49 joerg Exp $
--- 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"],