From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 02 Sep 2022 08:10:28 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oTzsp-0047tu-0h for lore@lore.pengutronix.de; Fri, 02 Sep 2022 08:10:28 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oTzsp-0007QF-SW; Fri, 02 Sep 2022 08:10:27 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oTzsK-0007Q6-3o for ptxdist@pengutronix.de; Fri, 02 Sep 2022 08:09:56 +0200 Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1oTzsI-0003CL-RO for ptxdist@pengutronix.de; Fri, 02 Sep 2022 08:09:54 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Fri, 2 Sep 2022 08:09:54 +0200 Message-Id: <20220902060954.11448-1-ada@thorsis.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] libzmq: Add some conf env variables not automatically detected X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Follow up to the discussion on the last version bump. zmq does not (try to) detect these features when cross compiling, so we must assist. Output of prepare stage contains this now: checking whether EFD_CLOEXEC is supported... (cached) yes … checking whether SOCK_CLOEXEC is supported... (cached) yes checking whether O_CLOEXEC is supported... (cached) yes checking whether SO_BINDTODEVICE is supported... (cached) yes checking whether SO_KEEPALIVE is supported... (cached) yes checking whether TCP_KEEPCNT is supported... (cached) yes checking whether TCP_KEEPIDLE is supported... (cached) yes checking whether TCP_KEEPINTVL is supported... (cached) yes checking whether TCP_KEEPALIVE is supported... not during cross-compile checking whether SO_PRIORITY is supported... (cached) yes checking whether getrandom is supported... not during cross-compile Link: https://lore.ptxdist.org/ptxdist/20220708151537.GK20240@pengutronix.de/T/#m9b6e02442a30b09d25fe98258051ebd34ee4f94b --- rules/libzmq.make | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/rules/libzmq.make b/rules/libzmq.make index d221ef6ac..eb52b339c 100644 --- a/rules/libzmq.make +++ b/rules/libzmq.make @@ -34,6 +34,29 @@ LIBZMQ_CONF_ENV := \ $(CROSS_ENV) \ ac_cv_lib_sodium_sodium_init=no +# Assume these are always available: +# - O_CLOEXEC (2007, glibc 2.7, kernel 2.6.23) +# - EFD_CLOEXEC (2008, glibc 2.9, kernel 2.6.27) +# - SOCK_CLOEXEC (2008, glibc 2.9, kernel 2.6.27) +# - SO_BINDTODEVICE (2009, kernel 2.6.31) +# - SO_KEEPALIVE (2009, glibc 1.x, kernel 2.6.31) +# - SO_PRIORITY (2009, kernel 2.6.31) +# - TCP_KEEPCNT (pre 2005/2013, glibc 2.18, pre kernel 2.6.12) +# - TCP_KEEPIDLE (pre 2005/2013, glibc 2.18, pre kernel 2.6.12) +# - TCP_KEEPINTVL (pre 2005/2013, glibc 2.18, pre kernel 2.6.12) +# Note: TCP_KEEPALIVE is not available in glibc/kernel, +# and getrandom(2) was introduced later with glibc 2.25, kernel 3.17) +LIBZMQ_CONF_ENV += \ + libzmq_cv_o_cloexec=yes \ + libzmq_cv_efd_cloexec=yes \ + libzmq_cv_sock_cloexec=yes \ + libzmq_cv_so_bindtodevice=yes \ + libzmq_cv_so_keepalive=yes \ + libzmq_cv_so_priority=yes \ + libzmq_cv_tcp_keepcnt=yes \ + libzmq_cv_tcp_keepidle=yes \ + libzmq_cv_tcp_keepintvl=yes + # # autoconf # base-commit: 20275946c697076ca6f696276117daf08ca6f4d1 -- 2.30.2