diff options
| author | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2023-04-17 16:34:20 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2023-04-18 14:50:33 +0200 |
| commit | 4e75476ccb093739ce8bf52d9a8fdf9947ef1cff (patch) | |
| tree | 6815162d38c510c9c69379020a7a2b7c39b59b0c | |
| parent | 0494604dbe661845eae82c5e288ef39ceccc7ba7 (diff) | |
| download | libgpiod-4e75476ccb093739ce8bf52d9a8fdf9947ef1cff.tar.gz | |
Revert "bindings: python: fix out-of-tree build"
This reverts commit addf968c7321132a8c659e06cc06c76534ec31f5.
We're moving towards being compatible with PEP 517 for building and
currently the following error happens when running setup.py build_py:
running build_py
error: Error: setup script specifies an absolute path:
<snip>/libgpiod/bindings/python/./gpiod/ext/chip.c
setup() arguments must *always* be /-separated paths relative to the
setup.py directory, *never* absolute paths.
As the Makefile build should only be used for development purposes, I
think we can safely drop support for out-of-tree build. Python bindings
have now been spun out into their own tarball and are available to
install from pip.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
| -rw-r--r-- | bindings/python/Makefile.am | 5 | ||||
| -rw-r--r-- | bindings/python/setup.py | 23 |
2 files changed, 13 insertions, 15 deletions
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 7fed629f..d04ec6d0 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -11,12 +11,13 @@ endif all-local: GPIOD_WITH_TESTS=$(BUILD_TESTS) \ - $(PYTHON) $(srcdir)/setup.py build_ext --inplace \ + $(PYTHON) setup.py build_ext --inplace \ --include-dirs=$(top_srcdir)/include/:$(top_srcdir)/tests/gpiosim/ \ --library-dirs=$(top_builddir)/lib/.libs/:$(top_srcdir)/tests/gpiosim/.libs/ install-exec-local: - $(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix) + GPIOD_WITH_TESTS= \ + $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) SUBDIRS = gpiod diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 5ddd5e09..a53d55fa 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -1,21 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-or-later # SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> -from os import environ, path +from os import environ from setuptools import setup, Extension, find_packages -def src(filename): - return path.join(path.dirname(__file__), filename) - gpiod_ext = Extension( "gpiod._ext", sources=[ - src("gpiod/ext/chip.c"), - src("gpiod/ext/common.c"), - src("gpiod/ext/line-config.c"), - src("gpiod/ext/line-settings.c"), - src("gpiod/ext/module.c"), - src("gpiod/ext/request.c"), + "gpiod/ext/chip.c", + "gpiod/ext/common.c", + "gpiod/ext/line-config.c", + "gpiod/ext/line-settings.c", + "gpiod/ext/module.c", + "gpiod/ext/request.c", ], define_macros=[("_GNU_SOURCE", "1")], libraries=["gpiod"], @@ -24,7 +21,7 @@ gpiod_ext = Extension( gpiosim_ext = Extension( "tests.gpiosim._ext", - sources=[src("tests/gpiosim/ext.c")], + sources=["tests/gpiosim/ext.c"], define_macros=[("_GNU_SOURCE", "1")], libraries=["gpiosim"], extra_compile_args=["-Wall", "-Wextra"], @@ -32,7 +29,7 @@ gpiosim_ext = Extension( procname_ext = Extension( "tests.procname._ext", - sources=[src("tests/procname/ext.c")], + sources=["tests/procname/ext.c"], define_macros=[("_GNU_SOURCE", "1")], extra_compile_args=["-Wall", "-Wextra"], ) @@ -42,7 +39,7 @@ if "GPIOD_WITH_TESTS" in environ and environ["GPIOD_WITH_TESTS"] == "1": extensions.append(gpiosim_ext) extensions.append(procname_ext) -with open(src("gpiod/version.py"), "r") as fd: +with open("gpiod/version.py", "r") as fd: exec(fd.read()) setup( |