From: Andreas Naumann <anaumann@ultratronik.de>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v5 2/2] qt5: Remove *.la/*.prl fixup script
Date: Mon, 15 Apr 2019 22:56:22 +0200 [thread overview]
Message-ID: <20190415205622.25268-2-anaumann@ultratronik.de> (raw)
In-Reply-To: <20190415205622.25268-1-anaumann@ultratronik.de>
After fixing Prefix in our custom qt.conf, Qt computes and embeds the correct
sysroot prefixed pathes in all *.la and *.prl files.
So remove fixup of
- *.la files because they are generically fixed anyway
- *.prl files because occurences of absolute /usr/lib were no longer observed
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
package/pkg-qmake.mk | 1 -
package/qt5/qt5.mk | 15 ---------------
2 files changed, 16 deletions(-)
v4->v5
- Split from qmake infra patch set
- Remove macro as well (Arnout)
- extend commit message a bit
diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk
index 404ba4c545..2bf16bf97f 100644
--- a/package/pkg-qmake.mk
+++ b/package/pkg-qmake.mk
@@ -68,7 +68,6 @@ endif
ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
$$(TARGET_MAKE_ENV) $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_BUILDDIR) $$($(2)_INSTALL_STAGING_OPTS)
- $$(QT5_LA_PRL_FILES_FIXUP)
endef
endif
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 6da898121d..4e738c75db 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -17,20 +17,5 @@ QT5_SITE = https://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT
include $(sort $(wildcard package/qt5/*/*.mk))
-define QT5_LA_PRL_FILES_FIXUP
- for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \
- $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \
- -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \
- -e "s:\(['= ]\)/usr:\\1 at STAGING_DIR@/usr:g" \
- -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
- -e "s:@BASE_DIR@:$(BASE_DIR):g" \
- $$i ; \
- $(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \
- done
- for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \
- $(SED) "s%-L/usr/lib%%" $$i; \
- done
-endef
-
# Variable for other Qt applications to use
QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++
--
2.21.0
next prev parent reply other threads:[~2019-04-15 20:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 20:56 [Buildroot] [PATCH v5 1/2] qt5base: Fix inconsistencies when overriding qmake properties Andreas Naumann
2019-04-15 20:56 ` Andreas Naumann [this message]
2019-04-17 22:16 ` [Buildroot] [PATCH v5 2/2] qt5: Remove *.la/*.prl fixup script Arnout Vandecappelle
2019-04-18 12:55 ` Andreas Naumann
2019-04-17 22:09 ` [Buildroot] [PATCH v5 1/2] qt5base: Fix inconsistencies when overriding qmake properties Arnout Vandecappelle
2019-04-18 4:23 ` Andreas Naumann
2019-08-17 21:59 ` Thomas Petazzoni
2019-09-04 12:31 ` Andreas Naumann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190415205622.25268-2-anaumann@ultratronik.de \
--to=anaumann@ultratronik.de \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.