Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 434230 Details for
Bug 582948
dev-qt/qtcore-5.6.0 with gcc-6 breaks build of net-p2p/qbittorrent-3.3.4-r1 and possibly others
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qtcore-5.6.0-no-default-isystem.patch
qtcore-5.6.0-no-default-isystem.patch (text/plain), 3.81 KB, created by
Peter Levine
on 2016-05-14 00:38:37 UTC
(
hide
)
Description:
qtcore-5.6.0-no-default-isystem.patch
Filename:
MIME Type:
Creator:
Peter Levine
Created:
2016-05-14 00:38:37 UTC
Size:
3.81 KB
patch
obsolete
>diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf >index ee9c1b8..fbe370e 100644 >--- a/mkspecs/common/clang.conf >+++ b/mkspecs/common/clang.conf >@@ -16,7 +16,6 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX > CONFIG += clang_pch_style > QMAKE_PCH_OUTPUT_EXT = .pch > >-QMAKE_CFLAGS_ISYSTEM = -isystem > QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} > QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} > QMAKE_CFLAGS_LTCG = -flto >diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf >index 27e812b..3340e89 100644 >--- a/mkspecs/common/gcc-base.conf >+++ b/mkspecs/common/gcc-base.conf >@@ -44,7 +44,6 @@ QMAKE_CFLAGS_DEBUG += -g > QMAKE_CFLAGS_SHLIB += -fPIC > QMAKE_CFLAGS_STATIC_LIB += -fPIC > QMAKE_CFLAGS_APP += -fPIC >-QMAKE_CFLAGS_ISYSTEM = -isystem > QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses > QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden > QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions >diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf >index 57f6c45..fa0e1da 100644 >--- a/mkspecs/linux-icc/qmake.conf >+++ b/mkspecs/linux-icc/qmake.conf >@@ -21,7 +21,6 @@ QMAKE_CFLAGS_DEBUG = -O0 -g > QMAKE_CFLAGS_SHLIB = -fPIC > QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB > QMAKE_CFLAGS_YACC = >-QMAKE_CFLAGS_ISYSTEM = -isystem > QMAKE_CFLAGS_THREAD = -D_REENTRANT > QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections > QMAKE_CFLAGS_LTCG = -ipo -fno-fat-lto-objects >diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp >index 848e47f..6daddb5 100644 >--- a/qmake/generators/unix/unixmake2.cpp >+++ b/qmake/generators/unix/unixmake2.cpp >@@ -180,16 +180,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) > t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; > t << "INCPATH ="; > { >- QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); > const ProStringList &incs = project->values("INCLUDEPATH"); > for(int i = 0; i < incs.size(); ++i) { > const ProString &inc = incs.at(i); >- if (inc.isEmpty()) >- continue; >- >- if (!isystem.isEmpty() && isSystemInclude(inc.toQString())) >- t << ' ' << isystem << ' '; >- else >+ if (!inc.isEmpty()) > t << " -I"; > t << escapeFilePath(inc); > } >@@ -1332,10 +1326,8 @@ void UnixMakefileGenerator::init2() > } > > if (include_deps && project->isActiveConfig("gcc_MD_depends")) { >- // use -MMD if we know about -isystem too >- ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD"); >- project->values("QMAKE_CFLAGS") += MD_flag; >- project->values("QMAKE_CXXFLAGS") += MD_flag; >+ project->values("QMAKE_CFLAGS") += "-MD"; >+ project->values("QMAKE_CXXFLAGS") += "-MD"; > } > } > >diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp >index 8c315e0..b063463 100644 >--- a/qmake/generators/win32/mingw_make.cpp >+++ b/qmake/generators/win32/mingw_make.cpp >@@ -254,17 +254,11 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t) > { > t << "INCPATH = "; > >- QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); > const ProStringList &incs = project->values("INCLUDEPATH"); > for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) { > QString inc = (*incit).toQString(); > inc.replace(QRegExp("\\\\$"), ""); >- >- if (!isystem.isEmpty() && isSystemInclude(inc)) >- t << isystem << ' '; >- else >- t << "-I"; >- t << escapeFilePath(inc) << ' '; >+ t << "-I" << escapeFilePath(inc) << ' '; > } > t << endl; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 582948
: 434230