Skip to content

Commit

Permalink
depends: drop pkg-config option from Qt build
Browse files Browse the repository at this point in the history
  • Loading branch information
fanquake committed Nov 14, 2024
1 parent 0d185bd commit e3e648c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
6 changes: 2 additions & 4 deletions depends/packages/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ $(package)_linguist_tools = lrelease lupdate lconvert
$(package)_patches = qt.pro
$(package)_patches += qttools_src.pro
$(package)_patches += mac-qmake.conf
$(package)_patches += fix_qt_pkgconfig.patch
$(package)_patches += no-xlib.patch
$(package)_patches += dont_hardcode_pwd.patch
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
Expand Down Expand Up @@ -64,6 +63,7 @@ $(package)_config_opts += -no-mimetype-database
$(package)_config_opts += -no-mtdev
$(package)_config_opts += -no-openssl
$(package)_config_opts += -no-openvg
$(package)_config_opts += -no-pkg-config
$(package)_config_opts += -no-reduce-relocations
$(package)_config_opts += -no-schannel
$(package)_config_opts += -no-sctp
Expand All @@ -84,7 +84,6 @@ $(package)_config_opts += -nomake examples
$(package)_config_opts += -nomake tests
$(package)_config_opts += -nomake tools
$(package)_config_opts += -opensource
$(package)_config_opts += -pkg-config
$(package)_config_opts += -prefix $(host_prefix)
$(package)_config_opts += -qt-libpng
$(package)_config_opts += -qt-pcre
Expand Down Expand Up @@ -226,7 +225,6 @@ define $(package)_preprocess_cmds
cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
patch -p1 -i $($(package)_patch_dir)/fix-macos-linker.patch && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \
Expand Down Expand Up @@ -273,6 +271,6 @@ define $(package)_stage_cmds
endef

define $(package)_postprocess_cmds
rm -rf doc/ native/lib/ && \
rm -rf doc/ native/lib/ lib/pkgconfig/ && \
rm -f lib/lib*.la
endef
11 changes: 0 additions & 11 deletions depends/patches/qt/fix_qt_pkgconfig.patch

This file was deleted.

0 comments on commit e3e648c

Please sign in to comment.