Mercurial > mxe-octave

comparison src/qtbase.mk @ 4498:f47df619cd1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtbase: don't strip, only disable xcb on windows.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Oct 2017 05:34:32 -0400
parents 903796b2fcb6
children b74853c2afa1
comparison
equal deleted inserted replaced
4497:e7d902eeefda 4498:f47df619cd1d
33 $(PKG)_CONFIGURE_DATABASE_OPTION := 33 $(PKG)_CONFIGURE_DATABASE_OPTION :=
34 $(PKG)_CONFIGURE_ENV := 34 $(PKG)_CONFIGURE_ENV :=
35 $(PKG)_CONFIGURE_INCLUDE_OPTION := 35 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
36 $(PKG)_CONFIGURE_LIBPATH_OPTION := 36 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
37 $(PKG)_CONFIGURE_PLATFORM_OPTION := 37 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
38 $(PKG)_CONFIGURE_OPTS :=
38 39
39 ifeq ($(MXE_WINDOWS_BUILD),yes) 40 ifeq ($(MXE_WINDOWS_BUILD),yes)
40 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5' 41 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)/qt5'
42 $(PKG)_CONFIGURE_OPTS += -no-xcb
41 else 43 else
42 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)' 44 $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
43 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2' 45 $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
46 $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
44 endif 47 endif
45 48
46 ## These are needed whether cross compiling or not. 49 ## These are needed whether cross compiling or not.
47 ifeq ($(MXE_WINDOWS_BUILD),yes) 50 ifeq ($(MXE_WINDOWS_BUILD),yes)
48 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32" 51 $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
76 cd '$(1)' && \ 79 cd '$(1)' && \
77 $($(PKG)_CONFIGURE_ENV) \ 80 $($(PKG)_CONFIGURE_ENV) \
78 ./configure \ 81 ./configure \
79 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ 82 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \
80 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ 83 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \
84 -no-strip \
81 -opensource \ 85 -opensource \
82 -c++std c++11 \ 86 -c++std c++11 \
83 -confirm-license \ 87 -confirm-license \
84 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ 88 $($(PKG)_CONFIGURE_PLATFORM_OPTION) \
85 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \ 89 $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \
86 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ 90 -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \
87 -force-pkg-config \ 91 -force-pkg-config \
88 -no-use-gold-linker \ 92 -no-use-gold-linker \
89 -release \
90 -shared \ 93 -shared \
91 $($(PKG)_CONFIGURE_PREFIX_OPTION) \ 94 $($(PKG)_CONFIGURE_PREFIX_OPTION) \
92 -hostprefix '$(BUILD_TOOLS_PREFIX)' \ 95 -hostprefix '$(BUILD_TOOLS_PREFIX)' \
93 -no-icu \ 96 -no-icu \
94 -opengl desktop \ 97 -opengl desktop \
104 -fontconfig \ 107 -fontconfig \
105 -system-freetype \ 108 -system-freetype \
106 -system-pcre \ 109 -system-pcre \
107 -no-openssl \ 110 -no-openssl \
108 -dbus-linked \ 111 -dbus-linked \
109 -no-pch \ 112 -no-pch \
110 -no-xcb \
111 -v \ 113 -v \
112 $($(PKG)_CONFIGURE_OPTS) 114 $($(PKG)_CONFIGURE_OPTS)
113 115
114 $(MAKE) -C '$(1)' -j '$(JOBS)' 116 $(MAKE) -C '$(1)' -j '$(JOBS)'
115 $(MAKE) -C '$(1)' -j 1 install 117 $(MAKE) -C '$(1)' -j 1 install