]> git.notmuchmail.org Git - notmuch/commitdiff
ruby: use proper talloc flags
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 2 Jan 2025 01:39:35 +0000 (19:39 -0600)
committerDavid Bremner <david@tethera.net>
Sat, 1 Mar 2025 13:37:15 +0000 (08:37 -0500)
This way talloc doesn't need to be installed in /usr.

bindings/Makefile.local
bindings/ruby/extconf.rb

index eb9326139bec89e7cc85bca8cc3f23c8895cbab3..72fe9850a23d1ab3bac54e8b47de1fdd7970f49d 100644 (file)
@@ -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 $@
index 7cec711f9ed22ab9d80b68c88f224df9bfe9de74..b6115688a978d22fb3a5dfc21327458850ec500c 100644 (file)
@@ -13,7 +13,6 @@ if not ENV['LIBNOTMUCH']
 end
 
 $LOCAL_LIBS += ENV['LIBNOTMUCH']
-$LIBS += " -ltalloc"
 
 # Create Makefile
 dir_config('notmuch')