Mercurial > mxe-octave

annotate src/qtbase.mk @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 191d93715dff
children 1928ff6acf13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4504
0743a56dd468 qtbase: Use bundled doubleconversion library.
John W. Eaton <jwe@octave.org>
parents: 4501
diff changeset
1 # This file is part of MXE.
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
2 # See index.html for further information.
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
3
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
4 PKG := qtbase
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
5 $(PKG)_IGNORE :=
6113
24e29dcb2e64 Qt5: Update to version 5.15.3.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5590
diff changeset
6 $(PKG)_VERSION := 5.15.3
24e29dcb2e64 Qt5: Update to version 5.15.3.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5590
diff changeset
7 $(PKG)_CHECKSUM := d7383126e1f412ef26096692b9e50a1887eb11f7
4735
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4618
diff changeset
8 $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION)
6113
24e29dcb2e64 Qt5: Update to version 5.15.3.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5590
diff changeset
9 $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz
24e29dcb2e64 Qt5: Update to version 5.15.3.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5590
diff changeset
10 $(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
4803
e2349691d6ae fix fontconfig dependencies
John W. Eaton <jwe@octave.org>
parents: 4801
diff changeset
11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
e2349691d6ae fix fontconfig dependencies
John W. Eaton <jwe@octave.org>
parents: 4801
diff changeset
12 $(PKG)_FONTCONFIG := fontconfig
e2349691d6ae fix fontconfig dependencies
John W. Eaton <jwe@octave.org>
parents: 4801
diff changeset
13 endif
5462
459061662bd5 * src/qtbase.mk: mingw depends on uuid
John Donoghue <john.donoghue@ieee.org>
parents: 5454
diff changeset
14 $(PKG)_DEPS := dbus double-conversion freetds freetype $($(PKG)_FONTCONFIG) icu4c jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib
4532
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
15
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
16 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
17 $(PKG)_CONFIGURE_DATABASE_OPTION :=
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
18 $(PKG)_CONFIGURE_ENV :=
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
19 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
20 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
21 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
22 $(PKG)_CONFIGURE_OPTS :=
4967
46f4053aa6a3 Attempt to include system pkg config path when when needed
John Donoghue <john.donoghue@ieee.org>
parents: 4958
diff changeset
23 $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
4532
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
24
4496
903796b2fcb6 fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
John W. Eaton <jwe@octave.org>
parents: 4487
diff changeset
25 ifeq ($(USE_SYSTEM_OPENGL),no)
903796b2fcb6 fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
John W. Eaton <jwe@octave.org>
parents: 4487
diff changeset
26 $(PKG)_DEPS += mesa
5020
59ea6e6b36e3 * src/qtbase.mk: disable iegl when using our opengl
John Donoghue
parents: 4967
diff changeset
27 $(PKG)_CONFIGURE_OPTS += -no-egl
4496
903796b2fcb6 fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
John W. Eaton <jwe@octave.org>
parents: 4487
diff changeset
28 endif
4532
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
29 ifeq ($(MXE_WINDOWS_BUILD),yes)
5462
459061662bd5 * src/qtbase.mk: mingw depends on uuid
John Donoghue <john.donoghue@ieee.org>
parents: 5454
diff changeset
30 $(PKG)_DEPS += uuid
4890
dd3cda73cefc * src/qtbase.mk: fix typo for enable of icu when windows 64
John Donoghue
parents: 4867
diff changeset
31 ifeq ($(ENABLE_WINDOWS_64),yes)
4532
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
32 $(PKG)_DEPS += icu4c
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
33 $(PKG)_CONFIGURE_OPTS += -icu
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
34 else
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
35 $(PKG)_CONFIGURE_OPTS += -no-icu
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
36 endif
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
37 else
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
38 $(PKG)_DEPS += icu4c
2ef6a1cbd7df qtbase: disable icu on w32 systems
John W. Eaton <jwe@octave.org>
parents: 4526
diff changeset
39 $(PKG)_CONFIGURE_OPTS += -icu
4487
7b73612f57b9 qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents: 4485
diff changeset
40 ifeq ($(USE_SYSTEM_X11_LIBS),no)
4958
8b4d4e06075d Add xkbcommon (required by linux qt5-5.12.X)
John Donoghue
parents: 4956
diff changeset
41 $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xkbcommon
4487
7b73612f57b9 qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents: 4485
diff changeset
42 endif
7b73612f57b9 qtbase: Optionally depend on X11 and fontconfig libraries.
John W. Eaton <jwe@octave.org>
parents: 4485
diff changeset
43 endif
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
44
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
45 define $(PKG)_UPDATE
4618
de2eedecd6ba update broken PKG_UPDATE rules, handle missing update rules
John Donoghue
parents: 4532
diff changeset
46 $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/ | \
4867
5ff8a7e5d891 * src/qtbase.mk: update update rule for double number minor version
John Donoghue
parents: 4855
diff changeset
47 $(SED) -n 's,.*href="\(5\.[0-9]\+\.[^/]*\)/".*,\1,p' | \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
48 grep -iv -- '-rc' | \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
49 sort |
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
50 tail -1
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
51 endef
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
52
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
53 ifeq ($(MXE_WINDOWS_BUILD),yes)
4518
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
54 ## I haven't been able to change this to be just $(HOST_PREFIX),
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
55 ## though I would prefer to do that. If it is changed, then
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
56 ## there are a number of other places that will need to be adjusted.
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
57 ## --jwe
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
58 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
5590
191d93715dff * src/qtbase.mk: use dynamic opengl in windows
John Donoghue <john.donoghue@ieee.org>
parents: 5589
diff changeset
59 $(PKG)_CONFIGURE_OPTS += -no-xcb -opengl dynamic
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
60 else
5590
191d93715dff * src/qtbase.mk: use dynamic opengl in windows
John Donoghue <john.donoghue@ieee.org>
parents: 5589
diff changeset
61 $(PKG)_CONFIGURE_OPTS += -opengl desktop
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
62 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
63 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
5022
9361f2645513 * src/qtbase.mk: dont use qt internal xcb when not using system opengl
John Donoghue
parents: 5020
diff changeset
64 ifeq ($(USE_SYSTEM_OPENGL),no)
9361f2645513 * src/qtbase.mk: dont use qt internal xcb when not using system opengl
John Donoghue
parents: 5020
diff changeset
65 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
9361f2645513 * src/qtbase.mk: dont use qt internal xcb when not using system opengl
John Donoghue
parents: 5020
diff changeset
66 else
5115
0043dcde564a * src/qtbase.mk: dont use inbuilt qt xcb if providing own xlibs
John Donoghue
parents: 5099
diff changeset
67 ifeq ($(USE_SYSTEM_X11_LIBS),no)
0043dcde564a * src/qtbase.mk: dont use inbuilt qt xcb if providing own xlibs
John Donoghue
parents: 5099
diff changeset
68 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
0043dcde564a * src/qtbase.mk: dont use inbuilt qt xcb if providing own xlibs
John Donoghue
parents: 5099
diff changeset
69 else
5447
a59bebc63c1b * src/qtbase.mk: fix qtbase native configure options
John Donoghue <john.donoghue@ieee.org>
parents: 5440
diff changeset
70 $(PKG)_CONFIGURE_OPTS += -qpa xcb
5115
0043dcde564a * src/qtbase.mk: dont use inbuilt qt xcb if providing own xlibs
John Donoghue
parents: 5099
diff changeset
71 endif
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
72 endif
5022
9361f2645513 * src/qtbase.mk: dont use qt internal xcb when not using system opengl
John Donoghue
parents: 5020
diff changeset
73 endif
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
74
4484
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
75 ## These are needed whether cross compiling or not.
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
76 ifeq ($(MXE_WINDOWS_BUILD),yes)
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
77 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
78 $(PKG)_CONFIGURE_DATABASE_OPTION += \
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
79 -system-sqlite -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
80 else
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
81 $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
82 endif
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
83
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
84 ifeq ($(MXE_NATIVE_BUILD),yes)
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
85 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)'
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
86 $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIBDIR)'
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
87 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
88 $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIB64DIR)'
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
89 endif
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
90 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0'
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
91 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include'
4484
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
92 ifeq ($(MXE_WINDOWS_BUILD),yes)
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
93 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
94 endif
4967
46f4053aa6a3 Attempt to include system pkg config path when when needed
John Donoghue <john.donoghue@ieee.org>
parents: 4958
diff changeset
95 $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH)
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
96 else
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
97 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
98 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
4484
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
99 ifeq ($(MXE_WINDOWS_BUILD),yes)
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
100 $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++
0d0e6c8015af qtbase.mk: Use proper platform option for cross and native windows builds.
John W. Eaton <jwe@octave.org>
parents: 4482
diff changeset
101 endif
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
102 endif
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
103
4735
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4618
diff changeset
104 $(PKG)_CONFIGURE_ENV += \
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4618
diff changeset
105 PKG_CONFIG="$(MXE_PKG_CONFIG)" \
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4618
diff changeset
106 PKG_CONFIG_SYSROOT_DIR="/" \
4967
46f4053aa6a3 Attempt to include system pkg config path when when needed
John Donoghue <john.donoghue@ieee.org>
parents: 4958
diff changeset
107 PKG_CONFIG_LIBDIR=$($(PKG)_PKG_CONFIG_PATH)
4735
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4618
diff changeset
108
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
109 define $(PKG)_BUILD
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
110 cd '$(1)' && \
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
111 $($(PKG)_CONFIGURE_ENV) \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
112 ./configure \
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
113 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
114 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \
4498
f47df619cd1d qtbase: don't strip, only disable xcb on windows.
John W. Eaton <jwe@octave.org>
parents: 4496
diff changeset
115 -no-strip \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
116 -opensource \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
117 -c++std c++11 \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
118 -confirm-license \
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
119 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
120 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
121 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
4735
4cea16af20b4 qt5: update to v5.11.0, add support pcre2
John Donoghue
parents: 4618
diff changeset
122 -pkg-config \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
123 -force-pkg-config \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
124 -no-use-gold-linker \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
125 -shared \
4485
86176b88d1f8 qtbase: Fix config include and prefix options for windows.
John W. Eaton <jwe@octave.org>
parents: 4484
diff changeset
126 $($(PKG)_CONFIGURE_PREFIX_OPTION) \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
127 -hostprefix '$(BUILD_TOOLS_PREFIX)' \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
128 -no-glib \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
129 -accessibility \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
130 -nomake examples \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
131 -nomake tests \
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
132 $($(PKG)_CONFIGURE_DATABASE_OPTION) \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
133 -system-zlib \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
134 -system-libpng \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
135 -system-libjpeg \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
136 -fontconfig \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
137 -system-freetype \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
138 -system-pcre \
4526
c283aa086767 double-conversion: new package
John D
parents: 4525
diff changeset
139 -system-doubleconversion \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
140 -no-openssl \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
141 -dbus-linked \
4525
0deb76a57fae Use libproxy, icu4c and libjbig in build
John D
parents: 4518
diff changeset
142 -libproxy \
4498
f47df619cd1d qtbase: don't strip, only disable xcb on windows.
John W. Eaton <jwe@octave.org>
parents: 4496
diff changeset
143 -no-pch \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
144 -v \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
145 $($(PKG)_CONFIGURE_OPTS)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
146
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
147 $(MAKE) -C '$(1)' -j '$(JOBS)'
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
148 $(MAKE) -C '$(1)' -j 1 install
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
149
4518
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
150 if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
151 $(INSTALL) -d '$(HOST_BINDIR)'; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
152 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Concurrentd.dll '$(HOST_BINDIR)'/Qt5Concurrentd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
153 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Concurrent.dll '$(HOST_BINDIR)'/Qt5Concurrent.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
154 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Cored.dll '$(HOST_BINDIR)'/Qt5Cored.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
155 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Core.dll '$(HOST_BINDIR)'/Qt5Core.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
156 mv '$(HOST_PREFIX)'/qt5/bin/Qt5DBusd.dll '$(HOST_BINDIR)'/Qt5DBusd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
157 mv '$(HOST_PREFIX)'/qt5/bin/Qt5DBus.dll '$(HOST_BINDIR)'/Qt5DBus.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
158 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Guid.dll '$(HOST_BINDIR)'/Qt5Guid.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
159 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Gui.dll '$(HOST_BINDIR)'/Qt5Gui.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
160 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Networkd.dll '$(HOST_BINDIR)'/Qt5Networkd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
161 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Network.dll '$(HOST_BINDIR)'/Qt5Network.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
162 mv '$(HOST_PREFIX)'/qt5/bin/Qt5OpenGLd.dll '$(HOST_BINDIR)'/Qt5OpenGLd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
163 mv '$(HOST_PREFIX)'/qt5/bin/Qt5OpenGL.dll '$(HOST_BINDIR)'/Qt5OpenGL.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
164 mv '$(HOST_PREFIX)'/qt5/bin/Qt5PrintSupportd.dll '$(HOST_BINDIR)'/Qt5PrintSupportd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
165 mv '$(HOST_PREFIX)'/qt5/bin/Qt5PrintSupport.dll '$(HOST_BINDIR)'/Qt5PrintSupport.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
166 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Sqld.dll '$(HOST_BINDIR)'/Qt5Sqld.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
167 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Sql.dll '$(HOST_BINDIR)'/Qt5Sql.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
168 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Testd.dll '$(HOST_BINDIR)'/Qt5Testd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
169 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Test.dll '$(HOST_BINDIR)'/Qt5Test.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
170 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Widgetsd.dll '$(HOST_BINDIR)'/Qt5Widgetsd.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
171 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Widgets.dll '$(HOST_BINDIR)'/Qt5Widgets.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
172 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Xmld.dll '$(HOST_BINDIR)'/Qt5Xmld.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
173 mv '$(HOST_PREFIX)'/qt5/bin/Qt5Xml.dll '$(HOST_BINDIR)'/Qt5Xml.dll; \
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
174 fi
c48b41efdcf4 qtbase: move dll files from qt5/bin to bin
John W. Eaton <jwe@octave.org>
parents: 4508
diff changeset
175
4482
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
176 if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
177 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt5; \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
178 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
179 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic; \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
180 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc; \
57600c0c6bdf allow native linux system builds of qtbase to work again
John W. Eaton <jwe@octave.org>
parents: 4310
diff changeset
181 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'lrelease; \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
182 fi
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
183
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
184 endef