[PATCH 2/3] ruby: use proper talloc flags

Subject: [PATCH 2/3] ruby: use proper talloc flags

Date: Wed, 1 Jan 2025 19:39:35 -0600

To: notmuch@notmuchmail.org

Cc: Michal Sapka

From: Felipe Contreras


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

_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: