Skip to content

Commit e3e648c

Browse files
committed
depends: drop pkg-config option from Qt build
1 parent 0d185bd commit e3e648c

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ $(package)_linguist_tools = lrelease lupdate lconvert
1010
$(package)_patches = qt.pro
1111
$(package)_patches += qttools_src.pro
1212
$(package)_patches += mac-qmake.conf
13-
$(package)_patches += fix_qt_pkgconfig.patch
1413
$(package)_patches += no-xlib.patch
1514
$(package)_patches += dont_hardcode_pwd.patch
1615
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
@@ -64,6 +63,7 @@ $(package)_config_opts += -no-mimetype-database
6463
$(package)_config_opts += -no-mtdev
6564
$(package)_config_opts += -no-openssl
6665
$(package)_config_opts += -no-openvg
66+
$(package)_config_opts += -no-pkg-config
6767
$(package)_config_opts += -no-reduce-relocations
6868
$(package)_config_opts += -no-schannel
6969
$(package)_config_opts += -no-sctp
@@ -84,7 +84,6 @@ $(package)_config_opts += -nomake examples
8484
$(package)_config_opts += -nomake tests
8585
$(package)_config_opts += -nomake tools
8686
$(package)_config_opts += -opensource
87-
$(package)_config_opts += -pkg-config
8887
$(package)_config_opts += -prefix $(host_prefix)
8988
$(package)_config_opts += -qt-libpng
9089
$(package)_config_opts += -qt-pcre
@@ -226,7 +225,6 @@ define $(package)_preprocess_cmds
226225
cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
227226
patch -p1 -i $($(package)_patch_dir)/fix-macos-linker.patch && \
228227
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
229-
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
230228
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
231229
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
232230
patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \
@@ -273,6 +271,6 @@ define $(package)_stage_cmds
273271
endef
274272

275273
define $(package)_postprocess_cmds
276-
rm -rf doc/ native/lib/ && \
274+
rm -rf doc/ native/lib/ lib/pkgconfig/ && \
277275
rm -f lib/lib*.la
278276
endef

depends/patches/qt/fix_qt_pkgconfig.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)