Skip to content

Commit

Permalink
qt6 declarative/tools: fix brotli linking
Browse files Browse the repository at this point in the history
  • Loading branch information
tonytheodore committed Sep 12, 2023
1 parent 5ce49eb commit 7b29f69
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/qt/qt6/qt6-qtdeclarative.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ QT6_QT_CMAKE = '$(QT6_PREFIX)/$(if $(findstring mingw,$(TARGET)),bin,libexec)/qt

define $(PKG)_BUILD
$(QT6_QT_CMAKE) -S '$(SOURCE_DIR)' -B '$(BUILD_DIR)'
$(if $(BUILD_STATIC),'$(SED)' -i "/^ *LINK_LIBRARIES = /{s/$$/ `'$(TARGET)-pkg-config' --libs libtiff-4`/g}" '$(BUILD_DIR)/build.ninja',)
$(if $(BUILD_STATIC),'$(SED)' -i "/^ *LINK_LIBRARIES = /{s/$$/ `'$(TARGET)-pkg-config' --libs libbrotlidec libtiff-4`/g}" '$(BUILD_DIR)/build.ninja',)
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' --build . -j '$(JOBS)'
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' --install .
endef
1 change: 1 addition & 0 deletions src/qt/qt6/qt6-qttools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ $(PKG)_DEPS := cc $($(PKG)_DEPS_$(BUILD)) qt6-qtdeclarative $(BUILD)~$(PKG)
define $(PKG)_BUILD
$(QT6_QT_CMAKE) -S '$(SOURCE_DIR)' -B '$(BUILD_DIR)' \
-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
$(if $(BUILD_STATIC),'$(SED)' -i "/^ *LINK_LIBRARIES = /{s/$$/ `'$(TARGET)-pkg-config' --libs libbrotlidec`/g}" '$(BUILD_DIR).test-cmake/build.ninja',)
# not built for some reason. make dummy so install won't fail
touch '$(BUILD_DIR)/bin/qhelpgenerator.exe'
cmake --build '$(BUILD_DIR)' -j '$(JOBS)'
Expand Down

0 comments on commit 7b29f69

Please sign in to comment.