[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha8-218-g077808f
Björn Jacke
bjacke at samba.org
Fri Jul 3 23:11:19 GMT 2009
The branch, master has been updated
via 077808f91610e70c2105b837a2704842191d1e3c (commit)
from cfacece9ed96dc46c12f20990110c6528080bc32 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 077808f91610e70c2105b837a2704842191d1e3c
Author: Björn Jacke <bj at sernet.de>
Date: Sat Jul 4 01:07:15 2009 +0200
s3/s4:build: honor library path from environment
we may not throw away LD_LIBRARY_PATH and friends as they sometimes contain
important information. Some of the build farm machines for example have the
python lib path in there - we can't run make test when we suddenly forget how
to use python
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/samba4.mk | 2 +-
source4/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 01ab5f0..dd133df 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3203,7 +3203,7 @@ valgrindtest:: all torture timelimit
SELFTEST_FORMAT = plain
selftestdir = ../selftest
-S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin"
+S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
selftest:: all torture timelimit
@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
diff --git a/source3/samba4.mk b/source3/samba4.mk
index e63a845..653ae25 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -172,7 +172,7 @@ everything:: $(patsubst %,%4,$(BINARIES))
setup:
@ln -sf ../source4/setup setup
-S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
+S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared:$$$(LIB_PATH_VAR)"
SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" PYTHON="$(PYTHON)" PERL="$(PERL)" \
$(PERL) $(selftestdir)/selftest.pl --prefix=st4 \
diff --git a/source4/Makefile b/source4/Makefile
index d6ce517..d6ae887 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -163,7 +163,7 @@ manpages:: $(MANPAGES)
all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
everything:: all
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir)
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR)
# 'make testsuite' creates all binaries which are
# needed by samba3's 'make test' and the build-farm
--
Samba Shared Repository
More information about the samba-cvs
mailing list