From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH] configure: fix python-cffi out-of-tree build
Date: Mon, 15 Feb 2021 23:54:10 +0200 [thread overview]
Message-ID: <20210215215410.28668-1-tomi.ollila@iki.fi> (raw)
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
reply other threads:[~2021-02-15 21:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210215215410.28668-1-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).