Revert "bindings: python: fix out-of-tree build"
PATCH 1/1 Revert "bindings: python: fix out-of-tree build"
From: Bartosz Golaszewski <[email protected]>
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 no been spun out into their own tarball and are available to install from pip.
--- bindings/python/Makefile.am | 5 +++-- bindings/python/setup.py | 23 ++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-)
bindings/python/Makefile.am +3 -2
@@ -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
bindings/python/setup.py +10 -13
@@ -1,21 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-or-later # SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <[email protected]> -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(
Signature · 1 line
2.37.2