[PATCH 1/3] ruby: simplify build

Subject: [PATCH 1/3] ruby: simplify build

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

To: notmuch@notmuchmail.org

Cc: Michal Sapka

From: Felipe Contreras

We can just always add EXTRA_INCFLAGS and EXTRA_LDFLAGS.
---
 bindings/Makefile.local  |  2 +-
 bindings/ruby/extconf.rb | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bindings/Makefile.local b/bindings/Makefile.local
index 9875123a..eb932613 100644
--- a/bindings/Makefile.local
+++ b/bindings/Makefile.local
@@ -9,8 +9,8 @@ $(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" \
 		LIBNOTMUCH="../../lib/$(LINKER_NAME)" \
-		NOTMUCH_SRCDIR='$(NOTMUCH_SRCDIR)' \
 		$(RUBY) extconf.rb --vendor
 	$(MAKE) -C $(dir)/ruby CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC" && touch $@
 endif
diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
index d914537c..7cec711f 100644
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -5,14 +5,8 @@
 
 require 'mkmf'
 
-dir = File.join(ENV['NOTMUCH_SRCDIR'], 'lib')
-
-# includes
-$INCFLAGS = "-I#{dir} #{$INCFLAGS}"
-
-if ENV['EXTRA_LDFLAGS']
-  $LDFLAGS += " " + ENV['EXTRA_LDFLAGS']
-end
+$INCFLAGS = "#{ENV['EXTRA_INCFLAGS']} #{$INCFLAGS}"
+$LDFLAGS = "#{ENV['EXTRA_LDFLAGS']} #{$LDFLAGS}"
 
 if not ENV['LIBNOTMUCH']
   exit 1
-- 
0.1

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

Thread: