[ptxdist] [PATCH] Qt5: make feature-relocatable an opt in feature.

[ptxdist] [PATCH] Qt5: make feature-relocatable an opt in feature.

[Nicholai Juul Hansen]

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.
---
 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 <http://www.newtec.com/>

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] Qt5: make feature-relocatable an opt in feature.

[Michael Olbrich]

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 <http://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