From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Michal Sapka <michal@sapka.me>
Subject: [PATCH 2/3] ruby: use proper talloc flags
Date: Wed, 1 Jan 2025 19:39:35 -0600 [thread overview]
Message-ID: <20250102013936.57479-3-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20250102013936.57479-1-felipe.contreras@gmail.com>
This way talloc doesn't need to be installed in /usr.
---
bindings/Makefile.local | 4 ++--
bindings/ruby/extconf.rb | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/bindings/Makefile.local b/bindings/Makefile.local
index eb932613..72fe9850 100644
--- a/bindings/Makefile.local
+++ b/bindings/Makefile.local
@@ -8,8 +8,8 @@ ruby-bindings: $(dir)/ruby.stamp
$(dir)/ruby.stamp: lib/$(LINKER_NAME)
ifeq ($(HAVE_RUBY_DEV),1)
cd $(dir)/ruby && \
- EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \
- EXTRA_INCFLAGS="-I$(NOTMUCH_SRCDIR)/lib" \
+ EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS) $(TALLOC_LDFLAGS)" \
+ EXTRA_INCFLAGS="-I$(NOTMUCH_SRCDIR)/lib $(TALLOC_CFLAGS)" \
LIBNOTMUCH="../../lib/$(LINKER_NAME)" \
$(RUBY) extconf.rb --vendor
$(MAKE) -C $(dir)/ruby CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC" && touch $@
diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
index 7cec711f..b6115688 100644
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -13,7 +13,6 @@ if not ENV['LIBNOTMUCH']
end
$LOCAL_LIBS += ENV['LIBNOTMUCH']
-$LIBS += " -ltalloc"
# Create Makefile
dir_config('notmuch')
--
0.1
next prev parent reply other threads:[~2025-01-02 1:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-02 1:39 [PATCH 0/3] ruby: build cleanups Felipe Contreras
2025-01-02 1:39 ` [PATCH 1/3] ruby: simplify build Felipe Contreras
2025-01-02 1:39 ` Felipe Contreras [this message]
2025-01-02 1:39 ` [PATCH 3/3] ruby: trivial build cleanup Felipe Contreras
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=20250102013936.57479-3-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=michal@sapka.me \
--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).