| Message ID | 20231107134718.2913223-1-phil@gadgetoid.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] bindings: python: fix library path for python test builds | expand |
On Tue, Nov 7, 2023 at 2:47 PM Phil Howard <phil@gadgetoid.com> wrote: > > Correct top_srcdir to top_builddir for out of tree builds. > > Signed-off-by: Phil Howard <phil@gadgetoid.com> > --- > bindings/python/Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am > index 079ceb1..b2f2779 100644 > --- a/bindings/python/Makefile.am > +++ b/bindings/python/Makefile.am > @@ -15,7 +15,7 @@ all-local: > GPIOD_WITH_TESTS=$(BUILD_TESTS) \ > $(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/ > + --library-dirs=$(top_builddir)/lib/.libs/:$(top_builddir)/tests/gpiosim/.libs/ > > install-exec-local: > GPIOD_WITH_TESTS= \ > -- > 2.34.1 > Phil, please squash these two patches together as you're modifying a line in the first one just to change it again in the second. Bart
On Wed, Nov 8, 2023 at 2:08 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Tue, Nov 7, 2023 at 2:47 PM Phil Howard <phil@gadgetoid.com> wrote: > > > > Correct top_srcdir to top_builddir for out of tree builds. > > > > Signed-off-by: Phil Howard <phil@gadgetoid.com> > > --- > > bindings/python/Makefile.am | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am > > index 079ceb1..b2f2779 100644 > > --- a/bindings/python/Makefile.am > > +++ b/bindings/python/Makefile.am > > @@ -15,7 +15,7 @@ all-local: > > GPIOD_WITH_TESTS=$(BUILD_TESTS) \ > > $(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/ > > + --library-dirs=$(top_builddir)/lib/.libs/:$(top_builddir)/tests/gpiosim/.libs/ > > > > install-exec-local: > > GPIOD_WITH_TESTS= \ > > -- > > 2.34.1 > > > > Phil, please squash these two patches together as you're modifying a > line in the first one just to change it again in the second. > > Bart Nevermind, I squashed it myself. Bart
On Wed, 8 Nov 2023 at 19:38, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Wed, Nov 8, 2023 at 2:08 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > On Tue, Nov 7, 2023 at 2:47 PM Phil Howard <phil@gadgetoid.com> wrote: > > > > > > Correct top_srcdir to top_builddir for out of tree builds. > > > > > > Signed-off-by: Phil Howard <phil@gadgetoid.com> > > > --- > > > bindings/python/Makefile.am | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am > > > index 079ceb1..b2f2779 100644 > > > --- a/bindings/python/Makefile.am > > > +++ b/bindings/python/Makefile.am > > > @@ -15,7 +15,7 @@ all-local: > > > GPIOD_WITH_TESTS=$(BUILD_TESTS) \ > > > $(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/ > > > + --library-dirs=$(top_builddir)/lib/.libs/:$(top_builddir)/tests/gpiosim/.libs/ > > > > > > install-exec-local: > > > GPIOD_WITH_TESTS= \ > > > -- > > > 2.34.1 > > > > > > > Phil, please squash these two patches together as you're modifying a > > line in the first one just to change it again in the second. > > > > Bart > > Nevermind, I squashed it myself. > > Bart Thanks, I sent them split since the latter speculative fix hides the previous actual bugfix but perhaps a better commit message could have worked.
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 079ceb1..b2f2779 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -15,7 +15,7 @@ all-local: GPIOD_WITH_TESTS=$(BUILD_TESTS) \ $(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/ + --library-dirs=$(top_builddir)/lib/.libs/:$(top_builddir)/tests/gpiosim/.libs/ install-exec-local: GPIOD_WITH_TESTS= \
Correct top_srcdir to top_builddir for out of tree builds. Signed-off-by: Phil Howard <phil@gadgetoid.com> --- bindings/python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)