summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-17 21:53:29 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:40 +1000
commit7ed65d2e126161f269ea823d2fa02e79b779fc63 (patch)
tree614ee0cf71a12bbcd6c6f5a7d6b45a4055b32c61 /lib
parent36e6d11dceb7af9cccdff3c631745427e31b8835 (diff)
downloadsamba-7ed65d2e126161f269ea823d2fa02e79b779fc63.tar.gz
samba-7ed65d2e126161f269ea823d2fa02e79b779fc63.tar.bz2
samba-7ed65d2e126161f269ea823d2fa02e79b779fc63.zip
build: result of hack session with ita
Diffstat (limited to 'lib')
-rw-r--r--lib/replace/wscript28
-rw-r--r--lib/tdb/wscript2
2 files changed, 20 insertions, 10 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index e150c9a105..28283cb0a4 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -1,3 +1,5 @@
+#! /usr/bin/env python
+
srcdir = '../..'
blddir = 'bin'
@@ -8,15 +10,16 @@ import Options, os
def set_options(opt):
opt.tool_options('compiler_cc')
+ # TODO: we are not yet obeying these default paths at install time
opt.add_option('--libdir',
- help=("object code libraries [PREFIX/lib]"),
- action="store", dest='LIBDIR', default=None)
+ help=("object code libraries [PREFIX/lib"),
+ action="store", dest='LIBDIR', default='${PREFIX}/lib')
opt.add_option('--bindir',
help=("user executables [PREFIX/bin]"),
- action="store", dest='BINDIR', default=None)
+ action="store", dest='BINDIR', default='${PREFIX}/bin')
opt.add_option('--sbindir',
help=("system admin executables [PREFIX/sbin]"),
- action="store", dest='SBINDIR', default=None)
+ action="store", dest='SBINDIR', default='${PREFIX}/sbin')
opt.add_option('--enable-rpath',
help=("Enable use of rpath for installed binaries"),
action="store_true", dest='enable_rpath', default=False)
@@ -32,12 +35,13 @@ def configure(conf):
# load our local waf extensions
conf.check_tool('wafsamba', tooldir=conf.srcdir + "/buildtools/wafsamba")
- conf.CONFIG_PATH('LIBDIR', '/lib')
- conf.CONFIG_PATH('BINDIR', '/bin')
- conf.CONFIG_PATH('SBINDIR', '/sbin')
-
conf.check_tool('compiler_cc')
+ # make the install paths available in environment
+ conf.env.LIBDIR = Options.options.LIBDIR
+ conf.env.BINDIR = Options.options.BINDIR
+ conf.env.SBINDIR = Options.options.SBINDIR
+
conf.env['RPATH_ON_INSTALL'] = Options.options.enable_rpath
conf.DEFINE('_GNU_SOURCE', 1)
@@ -180,10 +184,16 @@ main() { foo("hello"); }
def build(bld):
bld.set_rpath()
+ # libreplace needs to put the library in the right build groups
+ # as libreplace is a base library for everything, even for our
+ # compilers, we need libreplace to build very early
+ bld.SETUP_BUILD_GROUPS()
+
REPLACE_SOURCE = 'replace.c snprintf.c'
bld.SAMBA_LIBRARY('replace',
- REPLACE_SOURCE)
+ source=REPLACE_SOURCE,
+ group='base_libraries')
TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c
test/os2_delete.c test/getifaddrs.c'''
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 3e39ea82c8..c5e8409fa8 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -28,7 +28,7 @@ def build(bld):
bld.SAMBA_LIBRARY('tdb',
COMMON_SRC,
deps='replace',
- include_list='include',
+ includes='include',
vnum=VERSION)
bld.SAMBA_BINARY('tdbtorture',