From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 23 Oct 2025 15:14:37 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vBv9J-00Ay68-0i for lore@lore.pengutronix.de; Thu, 23 Oct 2025 15:14:37 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vBv9I-0001f5-NI; Thu, 23 Oct 2025 15:14:36 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vBv8V-00084r-SL; Thu, 23 Oct 2025 15:13:47 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vBv8V-00541D-2E; Thu, 23 Oct 2025 15:13:47 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vBv8V-000000055Ru-2h3X; Thu, 23 Oct 2025 15:13:47 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 23 Oct 2025 15:13:47 +0200 Message-ID: <20251023131347.1212579-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021131118.919834-9-ada@thorsis.com> References: <20251021131118.919834-9-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] libwebsockets: Pin down higher level config options 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 Cc: Alexander Dahl 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as a350b7f340b3d19cca652ad9b63bcfe82f9e97d8. Michael [sent from post-receive hook] On Thu, 23 Oct 2025 15:13:47 +0200, Alexander Dahl wrote: > These only set other options or are set anyways, should stay like this > to not interfere. > > Signed-off-by: Alexander Dahl > Message-Id: <20251021131118.919834-9-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make > index 9c039f1d4956..b8306210e61f 100644 > --- a/rules/libwebsockets.make > +++ b/rules/libwebsockets.make > @@ -37,6 +37,7 @@ LIBWEBSOCKETS_CONF_OPT := \ > -DBUILD_TESTING=OFF \ > -DDISABLE_WERROR=ON \ > -DLWS_CTEST_INTERNET_AVAILABLE=OFF \ > + -DLWS_FOR_GITOHASHI=OFF \ > -DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \ > -DLWS_LINK_TESTAPPS_DYNAMIC=ON \ > -DLWS_PLAT_ANDROID=OFF \ > @@ -60,6 +61,8 @@ LIBWEBSOCKETS_CONF_OPT := \ > -DLWS_WITH_BORINGSSL=OFF \ > -DLWS_WITH_BUNDLED_ZLIB=OFF \ > -DLWS_WITH_CYASSL=OFF \ > + -DLWS_WITH_DIR=ON \ > + -DLWS_WITH_DISTRO_RECOMMENDED=OFF \ > -DLWS_WITH_DLO=OFF \ > -DLWS_WITH_EXTERNAL_POLL=ON \ > -DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \ > @@ -67,13 +70,16 @@ LIBWEBSOCKETS_CONF_OPT := \ > -DLWS_WITH_HTTP2=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_ROLE_H2) \ > -DLWS_WITH_JPEG=OFF \ > -DLWS_WITH_JSONRPC=OFF \ > + -DLWS_WITH_LEJP_CONF=ON \ > -DLWS_WITH_LHP=OFF \ > -DLWS_WITH_LIBCAP=ON \ > -DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \ > -DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \ > -DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \ > + -DLWS_WITH_LWSWS=OFF \ > -DLWS_WITH_MBEDTLS=OFF \ > -DLWS_WITH_MINIMAL_EXAMPLES=OFF \ > + -DLWS_WITH_NETWORK=ON \ > -DLWS_WITH_OTA=OFF \ > -DLWS_WITH_SECURE_STREAMS=OFF \ > -DLWS_WITH_SHARED=ON \