NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5: Remove *.la/*.prl fixup script

Browse Source 
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>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Andreas Naumann 2019-04-15 22:56:22 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 951d438ddd
commit 428e5276e4
23 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/qt5/qt5.mk
View File

@ -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@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++

1
package/qt5/qt53d/qt53d.mk
View File

@ -27,7 +27,6 @@ endef
define QT53D_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)

1
package/qt5/qt5base/qt5base.mk
View File

@ -356,7 +356,6 @@ endef
define QT5BASE_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
$(QT5BASE_INSTALL_QT_CONF)
endef

1
package/qt5/qt5canvas3d/qt5canvas3d.mk
View File

@ -28,7 +28,6 @@ endef
define QT5CANVAS3D_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)

1
package/qt5/qt5charts/qt5charts.mk
View File

@ -34,7 +34,6 @@ endef
define QT5CHARTS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5connectivity/qt5connectivity.mk
View File

@ -36,7 +36,6 @@ endef
define QT5CONNECTIVITY_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)

1
package/qt5/qt5declarative/qt5declarative.mk
View File

@ -28,7 +28,6 @@ endef
define QT5DECLARATIVE_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5enginio/qt5enginio.mk
View File

@ -32,7 +32,6 @@ endef
define QT5ENGINIO_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)

1
package/qt5/qt5location/qt5location.mk
View File

@ -32,7 +32,6 @@ endef
define QT5LOCATION_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)

1
package/qt5/qt5multimedia/qt5multimedia.mk
View File

@ -44,7 +44,6 @@ endef
define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5script/qt5script.mk
View File

@ -37,7 +37,6 @@ endef
define QT5SCRIPT_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5scxml/qt5scxml.mk
View File

@ -26,7 +26,6 @@ endef
define QT5SCXML_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5sensors/qt5sensors.mk
View File

@ -32,7 +32,6 @@ endef
define QT5SENSORS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5serialbus/qt5serialbus.mk
View File

@ -23,7 +23,6 @@ endef
define QT5SERIALBUS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5serialport/qt5serialport.mk
View File

@ -28,7 +28,6 @@ endef
define QT5SERIALPORT_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5svg/qt5svg.mk
View File

@ -28,7 +28,6 @@ endef
define QT5SVG_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)

1
package/qt5/qt5wayland/qt5wayland.mk
View File

@ -40,7 +40,6 @@ endef
define QT5WAYLAND_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)

1
package/qt5/qt5webchannel/qt5webchannel.mk
View File

@ -35,7 +35,6 @@ endef
define QT5WEBCHANNEL_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)

1
package/qt5/qt5webengine/qt5webengine.mk
View File

@ -73,7 +73,6 @@ endef
define QT5WEBENGINE_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
define QT5WEBENGINE_INSTALL_TARGET_QMLS

1
package/qt5/qt5webkit/qt5webkit.mk
View File

@ -54,7 +54,6 @@ endef
define QT5WEBKIT_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)

1
package/qt5/qt5websockets/qt5websockets.mk
View File

@ -35,7 +35,6 @@ endef
define QT5WEBSOCKETS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)

1
package/qt5/qt5x11extras/qt5x11extras.mk
View File

@ -28,7 +28,6 @@ endef
define QT5X11EXTRAS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)

1
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
View File

@ -31,7 +31,6 @@ endef
define QT5XMLPATTERNS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_STATIC_LIBS),)