games-emulation/sdlmame: fix compile when qt5 isn't installed (bug #581972)

Package-Manager: portage-2.2.26
This commit is contained in:
Michael Sterrett
2016-05-03 13:58:21 -04:00
parent d7ad552812
commit 9cd74b65b7
2 changed files with 30 additions and 0 deletions

View File

@@ -0,0 +1,29 @@
No point in adding qt-related things to the compile line unless the qt debugger is wanted
--- scripts/src/osd/sdl_cfg.lua.orig
+++ scripts/src/osd/sdl_cfg.lua
@@ -115,14 +115,16 @@
configuration { }
elseif _OPTIONS["targetos"]=="linux" then
- if _OPTIONS["QT_HOME"]~=nil then
- buildoptions {
- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
- }
- else
- buildoptions {
- backtick("pkg-config --cflags Qt5Widgets"),
- }
+ if _OPTIONS["USE_QTDEBUG"]=="1" then
+ if _OPTIONS["QT_HOME"]~=nil then
+ buildoptions {
+ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
+ }
+ else
+ buildoptions {
+ backtick("pkg-config --cflags Qt5Widgets"),
+ }
+ end
end
elseif _OPTIONS["targetos"]=="macosx" then
defines {

View File

@@ -73,6 +73,7 @@ src_unpack() {
}
src_prepare() {
epatch "${FILESDIR}"/${P}-qt.patch
# Disable using bundled libraries
enable_feature USE_SYSTEM_LIB_EXPAT
enable_feature USE_SYSTEM_LIB_FLAC