sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

waf: use PYTHONARCHDIR for installing python shared libs

Browse Source 
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jan 14 08:19:40 CET 2011 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2011-01-14 17:20:01 +11:00
parent 0346b5b93c
commit 46a3588d3f
7 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildtools/wafsamba/samba_python.py
View File

@ -63,7 +63,7 @@ def SAMBA_PYTHON(bld, name,
link_name=link_name,
pyembed=True,
target_type='PYTHON',
install_path='${PYTHONDIR}',
install_path='${PYTHONARCHDIR}',
enabled=enabled)
Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON

4
buildtools/wafsamba/wafsamba.py
View File

@ -634,8 +634,8 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
if python_fixup:
# fixup the python path it will use to find Samba modules
inst_file = file + '.inst'
if bld.env["PYTHONDIR"] not in sys.path:
regex = "s|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONDIR}\\2|g"
if bld.env["PYTHONARCHDIR"] not in sys.path:
regex = "s|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONARCHDIR}\\2|g"
else:
# Eliminate updating sys.path if the target python dir is already
# in python path.

1
source4/dynconfig/dynconfig.c
View File

@ -92,4 +92,5 @@ DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR)
DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)

1
source4/dynconfig/dynconfig.h
View File

@ -56,4 +56,5 @@ DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR)
DEFINE_DYN_CONFIG_PROTO(WINBINDD_PRIVILEGED_SOCKET_DIR)
DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR)
DEFINE_DYN_CONFIG_PROTO(PYTHONDIR)
DEFINE_DYN_CONFIG_PROTO(PYTHONARCHDIR)
DEFINE_DYN_CONFIG_PROTO(SCRIPTSBINDIR)

3
source4/dynconfig/wscript
View File

@ -32,6 +32,7 @@ dyn_cflags = {
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
'PYTHONDIR' : '${PYTHONDIR}',
'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
'MODULESDIR' : '${PREFIX}/modules',
'INCLUDEDIR' : '${PREFIX}/include',
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
@ -62,7 +63,7 @@ dyn_cflags_fhs = {
'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd',
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
'PYTHONDIR' : '${PYTHONDIR}',
'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
'MODULESDIR' : '${LIBDIR}/samba',
'LIBEXECDIR' : '${MODULESDIR}',
'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',

4
source4/scripting/python/modules.c
View File

@ -50,6 +50,10 @@ bool py_update_path(const char *bindir)
return false;
}
if (!PySys_PathPrepend(py_path, dyn_PYTHONARCHDIR)) {
return false;
}
if (!PySys_PathPrepend(py_path, dyn_PYTHONDIR)) {
return false;
}

2
source4/wscript
View File

@ -122,6 +122,8 @@ def configure(conf):
# we don't want PYTHONDIR in config.h, as otherwise changing
# --prefix causes a complete rebuild
del(conf.env.defines['PYTHONDIR'])
del(conf.env.defines['PYTHONARCHDIR'])
conf.SAMBA_CONFIG_H('include/config.h')