whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some unix-specific options understood by configure.exe 

it's really a bit weird that the windows configure has more options to
configure unix features than the unix one, even if some are just
workarounds for missing auto-detection.

unlike in configure.exe itself, -posix-iconv is now also understood for
symmetry with -gnu-iconv and -sun-iconv.

Change-Id: Ic15376e5822e43b998bd17f02c11e5dd0567dc2b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Oswald Buddenhagen 2016-07-14 12:46:44 +02:00 committed by Lars Knoll
parent 0a434cc00f
commit 615616b069
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config_help.txt
View File

@ -175,7 +175,9 @@ Core options:
-doubleconversion .... Select used double conversion library [system/qt/no]
No implies use of sscanf_l and snprintf_l (imprecise).
-glib ................ Enable Glib support [auto]
-iconv ............... Enable iconv(3) support [auto]
-eventfd ............. Enable eventfd support
-inotify ............. Enable inotify support
-iconv ............... Enable iconv(3) support [posix/sun/gnu/no]
-icu ................. Enable ICU support [auto]
-pps ................. Enable PPS support [auto] (QNX only)
-pcre ................ Select used libpcre3 [system/qt]

23
configure.json
View File

@ -65,6 +65,7 @@
"egl": "boolean",
"eglfs": "boolean",
"evdev": "boolean",
"eventfd": "boolean",
"fontconfig": "boolean",
"force-asserts": { "type": "boolean", "name": "force_asserts" },
"force-debug-info": { "type": "boolean", "name": "force_debug_info" },
@ -83,9 +84,10 @@
"harfbuzz": { "type": "enum", "values": [ "no", "qt", "system" ] },
"headersclean": "boolean",
"host-option": "string",
"iconv": "boolean",
"iconv": { "type": "enum", "values": [ "no", "yes", "posix", "sun", "gnu" ] },
"icu": "boolean",
"imf": { "type": "boolean", "name": "qqnx_imf" },
"inotify": "boolean",
"journald": "boolean",
"lgmon": "boolean",
"libinput": "boolean",
@ -116,6 +118,7 @@
"pkg-config": "boolean",
"platform": "string",
"pps": { "type": "boolean", "name": "qqnx_pps" },
"posix-ipc": { "type": "boolean", "name": "ipc_posix" },
"profile": "boolean",
"psql_config": "string",
"pulseaudio": "boolean",
@ -1730,19 +1733,27 @@
},
"iconv": {
"description": "iconv",
"condition": "!config.win32 && (tests.posix-iconv || features.sun-libiconv || features.gnu-libiconv)",
"condition": "features.posix-libiconv || features.sun-libiconv || features.gnu-libiconv",
"output": [ "feature" ]
},
"posix-libiconv": {
"description": "POSIX iconv",
"enable": "input.iconv == 'posix'",
"disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'",
"condition": "!config.win32 && tests.posix-iconv"
},
"sun-libiconv": {
"description": "SUN iconv",
"disable": "input.iconv == 'no'",
"condition": "!config.win32 && !tests.posix-iconv && tests.sun-iconv",
"enable": "input.iconv == 'sun'",
"disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'",
"condition": "!config.win32 && !features.posix-libiconv && tests.sun-iconv",
"output": [ "publicQtConfig" ]
},
"gnu-libiconv": {
"description": "GNU iconv",
"disable": "input.iconv == 'no'",
"condition": "!config.win32 && !tests.posix-iconv && !tests.sun-iconv && tests.gnu-iconv",
"enable": "input.iconv == 'gnu'",
"disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'",
"condition": "!config.win32 && !features.posix-libiconv && !features.sun-libiconv && tests.gnu-iconv",
"output": [ "publicQtConfig" ]
},
"freetype": {