Commit aa457d3b authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

qt: tune .pc files after installation in staging directory 



The Qt configuration and installation process is a bit strange, and it
leads the .pc files to contain absolute paths to the staging
directory, while it should only contains paths relative to the staging
directory, because pkg-config already adds the path of the sysroot
automatically to the headers and libraries locations.

This allows the 'pkg-config --cflags' results for Qt libraries to be
correct.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b04d89b0

package/qt/qt.mk

+8 −1
Original line number Diff line number Diff line
@@ -577,13 +577,20 @@ endef 
# everything in the STAGING_DIR), we move host programs such as qmake,

# rcc or uic to the HOST_DIR so that they are available at the usual

# location. A qt.conf file is generated to make sure that all host

# programs still find all files they need.

# programs still find all files they need. The .pc files are tuned to

# remove the sysroot path from them, since pkg-config already adds it

# automatically.

define QT_INSTALL_STAGING_CMDS

	$(MAKE) -C $(@D) install

	mkdir -p $(HOST_DIR)/usr/bin

	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin

	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs

	$(QT_INSTALL_QT_CONF)

	for i in moc uic rcc lupdate lrelease ; do \

		$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/usr/bin/$${i}," \

			$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \

	done

	$(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc

endef



# Library installation