[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gstreamer-cvs
Subject:    [1.2] sdk/cerbero: build-tools: load the config after setting the new prefix
From:       slomo () kemper ! freedesktop ! org (Sebastian Dröge)
Date:       2013-10-31 11:49:05
Message-ID: 20131031114905.EEBD576575 () kemper ! freedesktop ! org
[Download RAW message or body]

Module: sdk/cerbero
Branch: 1.2
Commit: ce3dd313fde8baba5ea16dde32367b0adeda0e69
URL:    http://cgit.freedesktop.org/gstreamer/sdk/cerbero/commit/?id=ce3dd313fde8baba5ea16dde32367b0adeda0e69


Author: Andoni Morales Alastruey <ylatuya@gmail.com>
Date:   Wed Oct 30 13:51:28 2013 +0100

build-tools: load the config after setting the new prefix

This fixes incorrect -I<prefix> using the default prefix
instead of the build-tools one when 'prefix' is forced
in the config file

---

 cerbero/bootstrap/build_tools.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py
index 24e4ffa..bef1a6f 100644
--- a/cerbero/bootstrap/build_tools.py
+++ b/cerbero/bootstrap/build_tools.py
@@ -64,8 +64,8 @@ class BuildTools (BootstraperBase):
         config = Config()
         os.environ.clear()
         os.environ.update(self.config._pre_environ)
-        config.load()
         config.prefix = self.config.build_tools_prefix
+        config.load()
         config.build_tools_prefix = self.config.build_tools_prefix
         config.sources = self.config.build_tools_sources
         config.build_tools_sources = self.config.build_tools_sources

_______________________________________________
gstreamer-commits mailing list
gstreamer-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits


[prev in list] [next in list] [prev in thread] [next in thread]