Mercurial > mxe-octave

comparison src/qtbase.mk @ 4482:57600c0c6bdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow native linux system builds of qtbase to work again
author John W. Eaton <jwe@octave.org>
date Mon, 02 Oct 2017 13:56:01 -0400
parents 2c34ec679fb3
children 0d0e6c8015af
comparison
equal deleted inserted replaced
4481:7d6f1fd0d672 4482:57600c0c6bdf
16 grep -iv -- '-rc' | \ 16 grep -iv -- '-rc' | \
17 sort | 17 sort |
18 tail -1 18 tail -1
19 endef 19 endef
20 20
21 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
22 $(PKG)_CONFIGURE_DATABASE_OPTION :=
23 $(PKG)_CONFIGURE_ENV :=
24 $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)/freetype2'
25 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
26 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
27
28 ifeq ($(MXE_NATIVE_BUILD),yes)
29 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)'
30 $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIBDIR)'
31 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
32 $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIB64DIR)'
33 endif
34 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0'
35 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include'
36 else
37 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
38 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
39 endif
40
41 ifeq ($(MXE_WINDOWS_BUILD),yes)
42 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
43 $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
44 $(PKG)_CONFIGURE_DATABASE_OPTION += \
45 -system-sqlite -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql
46 else
47 $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite
48 endif
49
21 define $(PKG)_BUILD 50 define $(PKG)_BUILD
22 # ICU is buggy. See #653. TODO: reenable it some time in the future. 51 # ICU is buggy. See #653. TODO: reenable it some time in the future.
23 cd '$(1)' && \ 52 cd '$(1)' && \
24 PSQL_LIBS="-lpq -lsecur32 -lws2_32" \ 53 $($(PKG)_CONFIGURE_ENV) \
25 ./configure \ 54 ./configure \
55 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
56 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \
26 -opensource \ 57 -opensource \
27 -c++std c++11 \ 58 -c++std c++11 \
28 -confirm-license \ 59 -confirm-license \
29 -xplatform win32-g++ \ 60 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
30 -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) \ 61 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
31 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 62 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
32 -force-pkg-config \ 63 -force-pkg-config \
33 -no-use-gold-linker \ 64 -no-use-gold-linker \
34 -release \ 65 -release \
35 -shared \ 66 -shared \
36 -prefix '$(HOST_PREFIX)/qt5' \ 67 -prefix '$(HOST_PREFIX)' \
37 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ 68 -hostprefix '$(BUILD_TOOLS_PREFIX)' \
38 -no-icu \ 69 -no-icu \
39 -opengl desktop \ 70 -opengl desktop \
40 -no-glib \ 71 -no-glib \
41 -accessibility \ 72 -accessibility \
42 -nomake examples \ 73 -nomake examples \
43 -nomake tests \ 74 -nomake tests \
44 -plugin-sql-sqlite \ 75 $($(PKG)_CONFIGURE_DATABASE_OPTION) \
45 -plugin-sql-odbc \
46 -plugin-sql-psql \
47 -system-zlib \ 76 -system-zlib \
48 -system-libpng \ 77 -system-libpng \
49 -system-libjpeg \ 78 -system-libjpeg \
50 -system-sqlite \ 79 -system-sqlite \
51 -fontconfig \ 80 -fontconfig \
52 -system-freetype \ 81 -system-freetype \
53 -system-pcre \ 82 -system-pcre \
54 -no-openssl \ 83 -no-openssl \
55 -dbus-linked \ 84 -dbus-linked \
56 -no-pch \ 85 -no-pch \
86 -no-xcb \
57 -v \ 87 -v \
58 $($(PKG)_CONFIGURE_OPTS) 88 $($(PKG)_CONFIGURE_OPTS)
59 89
60 $(MAKE) -C '$(1)' -j '$(JOBS)' 90 $(MAKE) -C '$(1)' -j '$(JOBS)'
61 rm -rf '$(HOST_PREFIX)/qt5'
62 $(MAKE) -C '$(1)' -j 1 install 91 $(MAKE) -C '$(1)' -j 1 install
63 92
64 # remove this 93 if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \
65 if [ "$(MXE_NATIVE_BUILD)" = "xxno" ]; then \ 94 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt5; \
66 for f in moc qdbuscpp2xml qdbusxml2cpp qlalr qmake rcc uic; do \ 95 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc; \
67 mv "$(HOST_PREFIX)/qt5/bin/$$f" "$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)$$f-qt5"; \ 96 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic; \
68 done; \ 97 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc; \
98 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'lrelease; \
69 fi 99 fi
70
71 #ln -sf '$(HOST_PREFIX)/qt5/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt5
72 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'qmake-qt5
73 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'moc
74 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'uic
75 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'rcc
76 ln -sf '$(BUILD_TOOLS_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)'lrelease
77
78 # setup cmake toolchain
79 #echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
80 100
81 endef 101 endef
82 102