From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 25 Nov 2021 16:31:09 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mqGiL-0008Bq-Du for lore@lore.pengutronix.de; Thu, 25 Nov 2021 16:31:09 +0100 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 1mqGiL-0002yl-1a; Thu, 25 Nov 2021 16:31:09 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mqGhs-0002y2-GT; Thu, 25 Nov 2021 16:30:40 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1mqGhs-0010TM-8q; Thu, 25 Nov 2021 16:30:39 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1mqGhq-00Aj9L-M9; Thu, 25 Nov 2021 16:30:38 +0100 Date: Thu, 25 Nov 2021 16:30:38 +0100 From: Michael Olbrich To: Nicholai Juul Hansen Message-ID: Mail-Followup-To: Nicholai Juul Hansen , ptxdist@pengutronix.de References: <20211118103611.2601791-1-njh@newtec.dk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211118103611.2601791-1-njh@newtec.dk> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] Qt5: make feature-relocatable an opt in feature. 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: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 On Thu, Nov 18, 2021 at 11:36:11AM +0100, Nicholai Juul Hansen wrote: > Version 5.14.0 made Qt relocatable and enables the feature by standard. > This commit maintains the old pre 5.14.0 behavior and > fixes possible problems caused by the dynamic linker locating a library > through a symlink. I wasn't aware that Qt is now relocatable. I think we can just disable this unconditionally. Michael > --- > rules/qt5.in | 4 ++++ > rules/qt5.make | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/rules/qt5.in b/rules/qt5.in > index b0673efdf..d73fc0859 100644 > --- a/rules/qt5.in > +++ b/rules/qt5.in > @@ -135,6 +135,10 @@ config QT5_DBUS > select QT5_GLIB > prompt "D-Bus support" > > +config QT5_RELOCATABLE > + bool > + prompt "Relocatable" > + > config QT5_GLIB > bool > prompt "glib support" > diff --git a/rules/qt5.make b/rules/qt5.make > index 98d85a5dc..3d74b7eb1 100644 > --- a/rules/qt5.make > +++ b/rules/qt5.make > @@ -178,6 +178,7 @@ QT5_CONF_OPT := \ > --$(call ptx/endis, PTXCONF_QT5_GUI)-gui \ > --$(call ptx/endis, PTXCONF_QT5_WIDGETS)-widgets \ > -$(call ptx/ifdef, PTXCONF_QT5_DBUS,dbus-linked,no-dbus) \ > + -$(call ptx/ifdef, PTXCONF_QT5_RELOCATABLE,feature-relocatable,no-feature-relocatable) \ > --$(call ptx/endis, PTXCONF_QT5_ACCESSIBILITY)-accessibility \ > \ > --$(call ptx/endis, PTXCONF_QT5_GLIB)-glib \ > -- > 2.25.1 > > > -- > > > *Disclaimer > *This e-mail and any attachments are confidential and may > contain, copyright or legally privileged information > or material solely > intended for the recipient. If you have received this e-mail in error, > please notify the sender > immediately and delete the message and any > attachments from your system without producing, > distributing or retaining > copies. > > > > > *Personal Data* > > As a recipient of this e-mail, Newtec may > process personal data about you. > To learn more, please read our Newtec > Privacy Policy at www.newtec.com > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de