AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use earlyReport to handle incorrect use of RPATH config settings

Browse Source 
Report error when using RPATH settings on platforms that don’t support
it or when doing static builds

Change-Id: I2ba0c2bff5347170c7fcb339da80ef1f1974d43a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Mike Krus 2016-07-24 14:44:41 +01:00
parent b3959b515f
commit e7aec5302e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.json
View File

@ -1056,20 +1056,13 @@
},
"rpath": {
"description": "Build with RPATH",
"condition": [
"!config.ios && !config.win32",
"var.QMAKE_LFLAGS_RPATH != ''"
],
"autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared",
"output": [ "publicQtConfig" ]
},
"rpath_dir": {
"description": "RPATH directory",
"enable": "input.rpaths != ''",
"autoDetect": false,
"condition": [
"!config.ios && !config.win32",
"var.QMAKE_LFLAGS_RPATH != ''"
],
"output": [ { "type": "varAppend", "name": "EXTRA_RPATHS", "value": "input.rpaths" } ]
},
"rtti": {
@ -2218,6 +2211,16 @@ Qt can be built in release mode with separate debug information, so
"type": "error",
"condition": "input.xcb != '' && input.xcb != 'no' && input.xkbcommon == 'no'",
"message": "XCB plugin requires libxkbcommon. See -qt-xkbcommon-x11 and -system-xkbcommon-x11."
},
{
"type": "error",
"condition": "(features.rpath || features.rpath_dir) && !features.shared",
"message": "Static builds don't support RPATH"
},
{
"type": "error",
"condition": "(features.rpath || features.rpath_dir) && var.QMAKE_LFLAGS_RPATH == ''",
"message": "This platform does not support RPATH"
}
],