From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id AD+TBd3vdWcaKgAAqHPOHw:P1 (envelope-from ) for ; Thu, 02 Jan 2025 01:46:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id AD+TBd3vdWcaKgAAqHPOHw (envelope-from ) for ; Thu, 02 Jan 2025 02:46:05 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=g54lwire; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735782364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=f5J9wOoATPp3/diJVrA1blPM6sxpjEwRkXg4cktKrWQ=; b=PQEe4OQa7f1ibiQbxdM0LS3fg85lzNwnzq8fl4Md7eiCeltq76+p5tyiQfoyj74HvorhH7 YOvBiN8xtdPZnJmLSlDYrYwwpr5BO83yOqaGJGEVKehmtoUutcCZZw+YWkXv+NCtCg6Cgw zn+akkaSj2WVh5+1kM2m/c+kXJRAWHrykwhhmr9GHE+ukhLK+LZYQaBZTv8H9rOwyvph8P H4GogXQOxxovv/2f8dH76MsjTwJ4ExTuSqgS42rsrNlB6qvAFCOPvwnScpm48Ex09ch7r8 r3nzZeXUCoTwNgojVDG9iAZ9gb4comg/TiOWOyz51eAW9bLAhe2/vOfbk1VNcg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=g54lwire; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735782364; a=rsa-sha256; cv=none; b=mTbtZZe6GO+2wxbKpA84N0hUdcwgfBnvviAdzRl+7LiuSCLTVBhBXmIL8bff16Fv8nF8Cx 1CxtiwMFqjLNR75SplXqVkxR9EmnA98clsQpREcAC2VizQU/BwP/H153ZueXLsJXC2TbRh CrANu4Hz1exUtl7+pREKgih/GHbV8LJxgsK0fcnqK8XpEGX/yjUh2hdZs8pL4UtpVM7nrv fmC6bfVFld/PywbCyY1O14jpchgEhxagmNjRFBhaDjg8sOL2mBHJ9RzfUUy+BzkMoRwESR DOvIxIuoymC7FQm7lbFlVfeVgJLiZuTrKMEYn/HJT6yDsv0CupU0MxmIS6U9MA== Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 95B17D3F for ; Thu, 02 Jan 2025 02:46:04 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8ADF35F7B0; Thu, 2 Jan 2025 01:39:43 +0000 (UTC) Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) by mail.notmuchmail.org (Postfix) with ESMTPS id 69DFC5F5C6 for ; Thu, 2 Jan 2025 01:39:40 +0000 (UTC) Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-5f3397bef34so2570732eaf.0 for ; Wed, 01 Jan 2025 17:39:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735781979; x=1736386779; darn=notmuchmail.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yFm4HeAm92O3FiHc3nwd7cWzIe3CWQ8KHnYOHlVAhI8=; b=g54lwire4b0uU2J/0RidcYES+moTE/Gr7vZ9+OJy1jv6as6JbHF3qkfG2O+WFcVyHi Ss+zRi3YdpnmbIKsygGkg9vESKIR0Zk8JHsPA+shyubVFDMsBjJ3hxpeF9g11iEpyMQU z/tU8fuyg3SDCTomsAGOU+8q47gtY5cbKBJhOM+jkUn1U+dDZuPFV6pc30xO4wOxZFnk qrNrvgKxFm5Ox/YR+lgPc02RRM8TZCM6tFZ+QrxCYCVNvuzFu0aTHiVeea/8t231XOgR tiBQwKXfCyQ12PD/XQ9slnKntM8cGGXzaZBYMGz/9hXSnK8TX+tyQPhrum4gj0AE3cKd lr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735781979; x=1736386779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yFm4HeAm92O3FiHc3nwd7cWzIe3CWQ8KHnYOHlVAhI8=; b=Q0Ly3n19y1PK42dpkcvsYUn9hXpzAJb6NxsU1gbXxaAiQ+M7BmI/D953AUO2nnp8pW EkdqhEOCGt93ICcJaxEDt2yj+65QVCO1dm61MbS0M/KPcl7arD9Vy25K6hsdqmR5pXeS E8KiOuFBnkXTzZt+pnHVmYvA4J8Ct/vv0r9QaCO+UMgxmaJCwd/XlIu1F69y328yKwdf Ky59SF8+FusSjhykZb6ZesSChiBXqu/E35shY/o7Z4lNUuYpGLelnN1MxqT5zvnE9561 TlGz8H9yvg6GXpe5fyWz7wYPh5b79XDvp5zx3PT7ld3zPiSS7zvRNGcvgiK+zsDtYCk5 0dfA== X-Gm-Message-State: AOJu0YyQAPMnGwVonVHP5lLmnUvAZmaoe5sLOIpm2Lyo2X/36Y1cI8LF zR9QIcft1be88zOOXgeu3S8TzGYkxcz8J1UNnfTwkiRyoyJATWbai/gSOHpq X-Gm-Gg: ASbGncstDJKRmOYfbYItYLiEhshHox3kn8w3uLGCGWHZsgrW62MhwGglDJKr8yKRof2 y5eo94pWcbIL6gmUQP7V73hSqXxR1IBn420R2+2RFLE2Iv7lo4HHXzc8OrRMHYfbXifZORd0GYO /4UnucMMBH98upwLNoXhYdJb8k7FnrHDCBnxDVKoaky93MOJyfqimJXl+pjIjQY7KBVJfmNhxvx h5CrQBpg60jmSJddWnhUy6cvTKuk3DnD1xhogQ4692+xDKg4L7yA0X3YUG5ZPlQxA== X-Google-Smtp-Source: AGHT+IFzCOoYgeBH/WfsqFE0Q1EHHT3yPYa5IJxLUm4+wk7y1+GU/N1QfG2clppv8HtLUhDot3ux5A== X-Received: by 2002:a05:6871:e714:b0:29e:61cd:d3b2 with SMTP id 586e51a60fabf-2a7fb41369emr29636735fac.38.1735781978747; Wed, 01 Jan 2025 17:39:38 -0800 (PST) Received: from localhost ([2806:230:6026:c0c8:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2a7d757ea45sm8833026fac.32.2025.01.01.17.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jan 2025 17:39:38 -0800 (PST) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH 1/3] ruby: simplify build Date: Wed, 1 Jan 2025 19:39:34 -0600 Message-Id: <20250102013936.57479-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 0.1 In-Reply-To: <20250102013936.57479-1-felipe.contreras@gmail.com> References: <20250102013936.57479-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: E42M577U6MG34ZNTU5PE67G6UVZRRMTS X-Message-ID-Hash: E42M577U6MG34ZNTU5PE67G6UVZRRMTS X-MailFrom: felipe.contreras@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michal Sapka X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Country: DE X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 95B17D3F X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: 1.61 X-Spam-Score: 1.61 X-TUID: gXafvEtC1BHO 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