diff mbox

[v6,10/10] package/qt5base: provide "qt.conf" to make "qmake" relocatable

Message ID 1499185359-8293-11-git-send-email-wg@grandegger.com
State Superseded
Headers show

Commit Message

Wolfgang Grandegger July 4, 2017, 4:22 p.m. UTC 
The file "qt.conf" can be used to override the hard-coded paths that are
compiled into the Qt library. We need it to make "qmake" relocatable.

CC: Julien Corjon <corjon.j@ecagroup.com>
CC: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
---
 package/qt5/qt5base/qt.conf.in | 6 ++++++
 package/qt5/qt5base/qt5base.mk | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 package/qt5/qt5base/qt.conf.in

Comments

Arnout Vandecappelle July 5, 2017, 8:59 a.m. UTC | #1 
Hi Wolfgang,

On 04-07-17 18:22, Wolfgang Grandegger wrote:
> The file "qt.conf" can be used to override the hard-coded paths that are
> compiled into the Qt library. We need it to make "qmake" relocatable.

 All qt5 packages are failing because of this, e.g.
http://autobuild.buildroot.net/results/33e/33eb7b7ef7d232bed2432d1d44fd80a4fc8c4e2d

qt5serialport: installs files in
/accts/mlweber1/instance-2/output/host/usr/x86_64-buildroot-linux-uclibc/sysroot//accts/mlweber1/instance-2/output


 Can you have a look?

 Regards,
 Arnout

> 
> CC: Julien Corjon <corjon.j@ecagroup.com>
> CC: Peter Seiderer <ps.report@gmx.net>
> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
> ---
>  package/qt5/qt5base/qt.conf.in | 6 ++++++
>  package/qt5/qt5base/qt5base.mk | 8 ++++++++
>  2 files changed, 14 insertions(+)
>  create mode 100644 package/qt5/qt5base/qt.conf.in
> 
> diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in
> new file mode 100644
> index 0000000..48e4b92
> --- /dev/null
> +++ b/package/qt5/qt5base/qt.conf.in
> @@ -0,0 +1,6 @@
> +[Paths]
> +Prefix=@@HOST_DIR@@/usr
> +Sysroot=@@STAGING_DIR@@
> +Headers=/usr/include/qt5
> +Plugins=/usr/lib/qt/plugins
> +Examples=/usr/lib/qt/examples
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 5fe8bb8..883850b 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -258,9 +258,17 @@ define QT5BASE_BUILD_CMDS
>  	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
>  endef
>  
> +# The file "qt.conf" can be used to override the hard-coded paths that are
> +# compiled into the Qt library. We need it to make "qmake" relocatable.
> +define QT5BASE_INSTALL_QT_CONF
> +	sed -e "s\\@@HOST_DIR@@\\$(HOST_DIR)\\" -e "s\\@@STAGING_DIR@@\\$(STAGING_DIR)\\" \
> +		$(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/usr/bin/qt.conf
> +endef
> +
>  define QT5BASE_INSTALL_STAGING_CMDS
>  	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
>  	$(QT5_LA_PRL_FILES_FIXUP)
> +	$(QT5BASE_INSTALL_QT_CONF)
>  endef
>  
>  define QT5BASE_INSTALL_TARGET_LIBS
>
Wolfgang Grandegger July 5, 2017, 9:30 a.m. UTC | #2 
Hello Arnout,

Am 05.07.2017 um 10:59 schrieb Arnout Vandecappelle:
>   Hi Wolfgang,
> 
> On 04-07-17 18:22, Wolfgang Grandegger wrote:
>> The file "qt.conf" can be used to override the hard-coded paths that are
>> compiled into the Qt library. We need it to make "qmake" relocatable.
> 
>   All qt5 packages are failing because of this, e.g.
> http://autobuild.buildroot.net/results/33e/33eb7b7ef7d232bed2432d1d44fd80a4fc8c4e2d
> 
> qt5serialport: installs files in
> /accts/mlweber1/instance-2/output/host/usr/x86_64-buildroot-linux-uclibc/sysroot//accts/mlweber1/instance-2/output
> 
> 
>   Can you have a look?

I know the problem! The patched used an old version (from an old series) 
of "qt.conf.in"..., sorry!

Wolfgang.

> 
>   Regards,
>   Arnout
> 
>>
>> CC: Julien Corjon <corjon.j@ecagroup.com>
>> CC: Peter Seiderer <ps.report@gmx.net>
>> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
>> ---
>>   package/qt5/qt5base/qt.conf.in | 6 ++++++
>>   package/qt5/qt5base/qt5base.mk | 8 ++++++++
>>   2 files changed, 14 insertions(+)
>>   create mode 100644 package/qt5/qt5base/qt.conf.in
>>
>> diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in
>> new file mode 100644
>> index 0000000..48e4b92
>> --- /dev/null
>> +++ b/package/qt5/qt5base/qt.conf.in
>> @@ -0,0 +1,6 @@
>> +[Paths]
>> +Prefix=@@HOST_DIR@@/usr
>> +Sysroot=@@STAGING_DIR@@
>> +Headers=/usr/include/qt5
>> +Plugins=/usr/lib/qt/plugins
>> +Examples=/usr/lib/qt/examples
>> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
>> index 5fe8bb8..883850b 100644
>> --- a/package/qt5/qt5base/qt5base.mk
>> +++ b/package/qt5/qt5base/qt5base.mk
>> @@ -258,9 +258,17 @@ define QT5BASE_BUILD_CMDS
>>   	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
>>   endef
>>   
>> +# The file "qt.conf" can be used to override the hard-coded paths that are
>> +# compiled into the Qt library. We need it to make "qmake" relocatable.
>> +define QT5BASE_INSTALL_QT_CONF
>> +	sed -e "s\\@@HOST_DIR@@\\$(HOST_DIR)\\" -e "s\\@@STAGING_DIR@@\\$(STAGING_DIR)\\" \
>> +		$(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/usr/bin/qt.conf
>> +endef
>> +
>>   define QT5BASE_INSTALL_STAGING_CMDS
>>   	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
>>   	$(QT5_LA_PRL_FILES_FIXUP)
>> +	$(QT5BASE_INSTALL_QT_CONF)
>>   endef
>>   
>>   define QT5BASE_INSTALL_TARGET_LIBS
>>
>
Thomas Petazzoni July 5, 2017, 9:30 a.m. UTC | #3 
Hello,

On Wed, 5 Jul 2017 10:59:40 +0200, Arnout Vandecappelle wrote:

> On 04-07-17 18:22, Wolfgang Grandegger wrote:
> > The file "qt.conf" can be used to override the hard-coded paths that are
> > compiled into the Qt library. We need it to make "qmake" relocatable.  
> 
>  All qt5 packages are failing because of this, e.g.
> http://autobuild.buildroot.net/results/33e/33eb7b7ef7d232bed2432d1d44fd80a4fc8c4e2d
> 
> qt5serialport: installs files in
> /accts/mlweber1/instance-2/output/host/usr/x86_64-buildroot-linux-uclibc/sysroot//accts/mlweber1/instance-2/output

Due to the numerous build failures caused by this patch, I reverted the
commit.

Best regards,

Thomas
Wolfgang Grandegger July 5, 2017, 9:55 a.m. UTC | #4 
Hello Thomas,

Am 05.07.2017 um 11:30 schrieb Thomas Petazzoni:
> Hello,
> 
> On Wed, 5 Jul 2017 10:59:40 +0200, Arnout Vandecappelle wrote:
> 
>> On 04-07-17 18:22, Wolfgang Grandegger wrote:
>>> The file "qt.conf" can be used to override the hard-coded paths that are
>>> compiled into the Qt library. We need it to make "qmake" relocatable.
>>
>>   All qt5 packages are failing because of this, e.g.
>> http://autobuild.buildroot.net/results/33e/33eb7b7ef7d232bed2432d1d44fd80a4fc8c4e2d
>>
>> qt5serialport: installs files in
>> /accts/mlweber1/instance-2/output/host/usr/x86_64-buildroot-linux-uclibc/sysroot//accts/mlweber1/instance-2/output
> 
> Due to the numerous build failures caused by this patch, I reverted the
> commit.

I will resend then a proper patch for QT5 with the next release of my 
"Make SDK relocatable" patch series.

Wolfgang
diff mbox

Patch

diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in
new file mode 100644
index 0000000..48e4b92
--- /dev/null
+++ b/package/qt5/qt5base/qt.conf.in
@@ -0,0 +1,6 @@ 
+[Paths]
+Prefix=@@HOST_DIR@@/usr
+Sysroot=@@STAGING_DIR@@
+Headers=/usr/include/qt5
+Plugins=/usr/lib/qt/plugins
+Examples=/usr/lib/qt/examples
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 5fe8bb8..883850b 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -258,9 +258,17 @@  define QT5BASE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
+# The file "qt.conf" can be used to override the hard-coded paths that are
+# compiled into the Qt library. We need it to make "qmake" relocatable.
+define QT5BASE_INSTALL_QT_CONF
+	sed -e "s\\@@HOST_DIR@@\\$(HOST_DIR)\\" -e "s\\@@STAGING_DIR@@\\$(STAGING_DIR)\\" \
+		$(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/usr/bin/qt.conf
+endef
+
 define QT5BASE_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 	$(QT5_LA_PRL_FILES_FIXUP)
+	$(QT5BASE_INSTALL_QT_CONF)
 endef
 
 define QT5BASE_INSTALL_TARGET_LIBS