diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-08 11:01:13 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-08 11:13:28 +1100 |
| commit | b867dc9ea204cfd449ba26f238f1fe733330fe75 (patch) | |
| tree | 5463610388d9ad5afceccb9c6abcc060404978bb | |
| parent | d738a0448ddec6b1fb4491aabdf059ce837cb5ac (diff) | |
| download | samba-b867dc9ea204cfd449ba26f238f1fe733330fe75.tar.gz samba-b867dc9ea204cfd449ba26f238f1fe733330fe75.tar.bz2 samba-b867dc9ea204cfd449ba26f238f1fe733330fe75.zip | |
waf: prevent us from modifying non-install libs during make install
we need to ensure that 'make install' does not change any of our build
libraries, and only changes the .inst.so libraries, otherwise doing a
make test in the build directory directly after a make install could
use the installed libraries, which would mean using the wrong
LDB_MODULES_PATH
this could cause the "unknown error" loading ldb modules when running
some commands directly after a make install
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_install.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 9401d228c5..634d5b120b 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -18,7 +18,7 @@ def install_binary(self): install_ldflags = install_rpath(bld) build_ldflags = build_rpath(bld) - if not Options.is_install or not self.samba_install: + if not Options.is_install: # just need to set rpath if we are not installing self.env.RPATH = build_ldflags return @@ -38,6 +38,10 @@ def install_binary(self): # setup the right rpath link flags for the install self.env.RPATH = install_ldflags + if not self.samba_install: + # this binary is marked not to be installed + return + # tell waf to install the right binary bld.install_as(os.path.join(install_path, orig_target), os.path.join(self.path.abspath(bld.env), self.target), @@ -77,7 +81,7 @@ def install_library(self): # install link. That stops us from overwriting the existing build # target, which has different ldflags self.done_install_library = True - t = self.clone('default') + t = self t.posted = False t.target += '.inst' self.env.RPATH = build_ldflags |