unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] configure: fix python-cffi out-of-tree build
@ 2021-02-15 21:54 Tomi Ollila
  0 siblings, 0 replies; only message in thread
From: Tomi Ollila @ 2021-02-15 21:54 UTC (permalink / raw)
  To: notmuch; +Cc: tomi.ollila

In case of out of tree build:

* Copy version.txt and lib/notmuch.h to the root of the python-cffi
  bindings directory (in addtion to the files already copied there)

* Modify _build.py to refer '.' instead of '../../lib' for searching
  c include files

While at it, fixed indentation in related lines from 7 spaces to one
tab (like indentation done elsewhere in the same file).
---
 configure | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index cfa9c09b..11605942 100755
--- a/configure
+++ b/configure
@@ -75,9 +75,14 @@ if [ "$srcdir" != "." ]; then
     # out-of-tree builds (again, not ideal).
     mkdir bindings/python-cffi
     cp -a "$srcdir"/bindings/python-cffi/tests \
-       "$srcdir"/bindings/python-cffi/notmuch2 \
-       "$srcdir"/bindings/python-cffi/setup.py \
-       bindings/python-cffi/
+	"$srcdir"/bindings/python-cffi/notmuch2 \
+	"$srcdir"/bindings/python-cffi/setup.py \
+	"$srcdir"/bindings/python-cffi/version.txt \
+	"$srcdir"/lib/notmuch.h \
+	bindings/python-cffi/
+    sed "/include_dirs=/ s|'[.][.]/[.][.]/lib'|'.'|" \
+	bindings/python-cffi/notmuch2/_build.py > _build.py.wip
+    mv _build.py.wip bindings/python-cffi/notmuch2/_build.py
 fi
 
 # Set several defaults (optionally specified by the user in
-- 
2.29.2

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-02-15 21:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-15 21:54 [PATCH] configure: fix python-cffi out-of-tree build Tomi Ollila

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).