python.pkgs.pysideShiboken: fix gcc6 build
This commit is contained in:
parent
a580bedcf1
commit
48f337a882
18
pkgs/development/python-modules/pyside/gcc6.patch
Normal file
18
pkgs/development/python-modules/pyside/gcc6.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
--- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp 2017-08-26 09:06:27.216859143 +0100
|
||||||
|
+++ Shiboken-1.2.4/tests/libsample/simplefile.cpp 2017-08-26 09:05:40.037029652 +0100
|
||||||
|
@@ -90,13 +90,13 @@
|
||||||
|
SimpleFile::exists() const
|
||||||
|
{
|
||||||
|
std::ifstream ifile(p->m_filename);
|
||||||
|
- return ifile;
|
||||||
|
+ return (bool)ifile;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
SimpleFile::exists(const char* filename)
|
||||||
|
{
|
||||||
|
std::ifstream ifile(filename);
|
||||||
|
- return ifile;
|
||||||
|
+ return (bool)ifile;
|
||||||
|
}
|
||||||
|
|
@ -14,6 +14,7 @@ buildPythonPackage rec {
|
|||||||
sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
|
sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
|
buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
|
||||||
@ -23,7 +24,9 @@ buildPythonPackage rec {
|
|||||||
substituteInPlace generator/CMakeLists.txt --replace \
|
substituteInPlace generator/CMakeLists.txt --replace \
|
||||||
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
|
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
|
||||||
'';
|
'';
|
||||||
patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null;
|
|
||||||
|
# gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
|
||||||
|
patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch);
|
||||||
|
|
||||||
cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
|
cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user