| Message ID | 20190322183904.22401-7-anaumann@ultratronik.de |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Qt5 qmake infra with generic target install | expand |
Hi, I'd really be interested if somebody remembers why this was needed. *.la files are fixed in another generic step anyway, so why do it twice? Also, I have not found absolute /usr/lib pathes in any of the prl files without this. regards, Andreas Am 22.03.19 um 19:39 schrieb Andreas Naumann: > After fixing Prefix in our custom qt.conf, Qt computes and embeds the > correct sysroot prefixed pathes in all *.la and *.prl files. > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> --- > package/pkg-qmake.mk | 1 - 1 file changed, 1 deletion(-) > > diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index > 11cfb809fc..9293253fae 100644 --- a/package/pkg-qmake.mk +++ > b/package/pkg-qmake.mk @@ -77,7 +77,6 @@ define > $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) \ $$($(2)_MAKE_ENV) \ > $$(MAKE) -C $$($$(PKG)_SRCDIR) $$($(2)_INSTALL_STAGING_OPTS) - > $$(QT5_LA_PRL_FILES_FIXUP) endef endif > >
On 27/03/2019 23:13, Andreas Naumann wrote: > Hi, > > I'd really be interested if somebody remembers why this was needed. *.la > files are fixed in another generic step anyway, so why do it twice? That's easy: at the time this was added (commit 1737b5648c9f778149eb7da5897b66a9577d22c4 from 2013) the fixup was only done for autotools packages, not for all packages. That changed only with commit 67f8138a46388f28d00dc8711b64d04ac7ebb464 in 2015. > Also, I have not found absolute /usr/lib pathes in any of the prl files > without this. This I can't explain. I've added Thomas in Cc but I doubt that he remembers. But isn't this exactly what gets fixed by the previous patch? BTW, this patch should also remove the definition of the macro. Regards, Arnout > > regards, > Andreas > > > Am 22.03.19 um 19:39 schrieb Andreas Naumann: >> After fixing Prefix in our custom qt.conf, Qt computes and embeds the >> correct sysroot prefixed pathes in all *.la and *.prl files. >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> --- >> package/pkg-qmake.mk | 1 - 1 file changed, 1 deletion(-) >> >> diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index >> 11cfb809fc..9293253fae 100644 --- a/package/pkg-qmake.mk +++ >> b/package/pkg-qmake.mk @@ -77,7 +77,6 @@ define $(2)_INSTALL_STAGING_CMDS >> $$(TARGET_MAKE_ENV) \ $$($(2)_MAKE_ENV) \ $$(MAKE) -C $$($$(PKG)_SRCDIR) >> $$($(2)_INSTALL_STAGING_OPTS) - $$(QT5_LA_PRL_FILES_FIXUP) endef endif >> >> > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hello, On Sat, 13 Apr 2019 15:08:58 +0200 Arnout Vandecappelle <arnout@mind.be> wrote: > > Also, I have not found absolute /usr/lib pathes in any of the prl files > > without this. > > This I can't explain. I've added Thomas in Cc but I doubt that he remembers. I obviously won't remember more than what the commit history has. However, this .prl fixup has been added a *long* time ago, I believe right when qt5 support was introduced. It is very well possible that things changed since then, making the fixup possibly no longer needed. Thomas
diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 11cfb809fc..9293253fae 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -77,7 +77,6 @@ define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) \ $$($(2)_MAKE_ENV) \ $$(MAKE) -C $$($$(PKG)_SRCDIR) $$($(2)_INSTALL_STAGING_OPTS) - $$(QT5_LA_PRL_FILES_FIXUP) endef endif
After fixing Prefix in our custom qt.conf, Qt computes and embeds the correct sysroot prefixed pathes in all *.la and *.prl files. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> --- package/pkg-qmake.mk | 1 - 1 file changed, 1 deletion(-)