Virtualization
/
dtc
mirror of https://gitlab.com/qemu-project/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pylibfdt: We don't need include files from the base directory 

pylibfdt/setup.py currently adds include flags to the extension module
build to allow include files in the base dtc directory.  But pylibfdt
doesn't rely on any headers there, only on headers in libfdt/ - it also
shouldn't rely on dtc headers at any future time.

So, remove that from the include list, allowing some simplifications to
setup.py.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
David Gibson 2018-08-08 17:52:49 +10:00
parent e84742aa7b
commit 59327523d0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pylibfdt/setup.py
View File

@ -70,14 +70,12 @@ def GetEnvFromMakefiles():
Returns: Returns:
Tuple with: Tuple with:
List of swig options
Version string Version string
List of files to build List of files to build
List of extra C preprocessor flags needed List of extra C preprocessor flags needed
Object directory to use (always '') Object directory to use (always '')
""" """
basedir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))) basedir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
swig_opts = ['-I%s' % basedir]
makevars = ParseMakefile(os.path.join(basedir, 'Makefile')) makevars = ParseMakefile(os.path.join(basedir, 'Makefile'))
version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'], version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'],
makevars['SUBLEVEL']) makevars['SUBLEVEL'])
@ -85,9 +83,9 @@ def GetEnvFromMakefiles():
files = makevars['LIBFDT_SRCS'].split() files = makevars['LIBFDT_SRCS'].split()
files = [os.path.join(basedir, 'libfdt', fname) for fname in files] files = [os.path.join(basedir, 'libfdt', fname) for fname in files]
files.append('pylibfdt/libfdt.i') files.append('pylibfdt/libfdt.i')
cflags = ['-I%s' % basedir, '-I%s/libfdt' % basedir] cflags = ['-I%s/libfdt' % basedir]
objdir = '' objdir = ''
return swig_opts, version, files, cflags, objdir return version, files, cflags, objdir
progname = sys.argv[0] progname = sys.argv[0]
@ -95,19 +93,17 @@ files = os.environ.get('SOURCES', '').split()
cflags = os.environ.get('CPPFLAGS', '').split() cflags = os.environ.get('CPPFLAGS', '').split()
objdir = os.environ.get('OBJDIR') objdir = os.environ.get('OBJDIR')
version = os.environ.get('VERSION') version = os.environ.get('VERSION')
swig_opts = []
# If we were called directly rather than through our Makefile (which is often # If we were called directly rather than through our Makefile (which is often
# the case with Python module installation), read the settings from the # the case with Python module installation), read the settings from the
# Makefile. # Makefile.
if not all((version, files, cflags, objdir)): if not all((version, files, cflags, objdir)):
swig_opts, version, files, cflags, objdir = GetEnvFromMakefiles() version, files, cflags, objdir = GetEnvFromMakefiles()
libfdt_module = Extension( libfdt_module = Extension(
'_libfdt', '_libfdt',
sources = files, sources = files,
extra_compile_args = cflags, extra_compile_args = cflags,
swig_opts = swig_opts,
) )
setup( setup(