gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/cgkit: Add py3.5 support

Browse Source 
* EAPI 6
* Call distutils-r1_python_prepare_all
* Fix compiling in C++14 mode with GCC 6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=611774
Package-Manager: Portage-2.3.4, Repoman-2.3.2
This commit is contained in:
David Seifert
2017-03-11 01:00:45 +01:00
parent eb3c6a3726
commit c1ec4fe569
3 changed files with 158 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch Normal file
View File

@@ -0,0 +1,40 @@
Make scons respect user variables
--- a/setup.py
+++ b/setup.py
@@ -214,7 +214,7 @@
# The following variables are used to customize the compile process
-INC_DIRS = []
+INC_DIRS = ['/usr/include']
LIB_DIRS = []
LIBS = []
CC_ARGS = []
--- a/supportlib/SConstruct
+++ b/supportlib/SConstruct
@@ -30,19 +30,11 @@
# Add the local 'include' directory...
env.Append(CPPPATH = ["include"])
-# Do platform specific stuff...
-if sys.platform=="win32":
- env.Append(CCFLAGS = ["/GX", "/GR", "/MD", "/W3"])
- env.Append(CPPDEFINES = ["WIN32", "_LIB"])
-elif sys.platform=="darwin":
- env.Append(CCFLAGS = ["-arch", "x86_64"])
- env.Append(CCFLAGS = ["-arch", "i386"])
-# env.Append(CCFLAGS = ["-arch", "ppc"])
- env.Append(CPPPATH = ["/opt/local/include"])
- env.Append(CCFLAGS = ["-fPIC"])
-else:
- env.Append(CPPPATH = ["/opt/local/include"])
- env.Append(CCFLAGS = ["-fPIC"])
+env.Append(CPPPATH = ['/usr/include'])
+env['AR'] = os.environ.get('AR', 'ar')
+env['CXX'] = os.environ.get('CXX', 'g++')
+env['CXXFLAGS'] = os.environ.get('CXXFLAGS', '-fPIC')
+env['CPPFLAGS'] = os.environ.get('CPPFLAGS', '')
# Setup the help message
Help(vars.GenerateHelpText(env))

33
dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch Normal file
View File

@@ -0,0 +1,33 @@
Fix building in C++14 mode
--- a/wrappers/py_geoms1.cpp
+++ b/wrappers/py_geoms1.cpp
@@ -142,7 +142,7 @@
string name = it->first;
const PrimVarInfo& info = it->second;
it++;
- return make_tuple(name, info.storage, info.type, info.multiplicity);
+ return boost::python::make_tuple(name, info.storage, info.type, info.multiplicity);
}
}
@@ -163,7 +163,7 @@
}
else
{
- return make_tuple(name, info->storage, info->type, info->multiplicity);
+ return boost::python::make_tuple(name, info->storage, info->type, info->multiplicity);
}
}
--- a/wrappers/py_slot.h
+++ b/wrappers/py_slot.h
@@ -40,7 +40,7 @@
// .def("onValueChanged", &Slot<double>::onValueChanged, &SlotWrapper<double>::base_onValueChanged)
// This macro can be used to create a new Python array slot type
-#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_"sname"_Iterator", init<ArraySlot<stype>&>()) \
+#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_" sname "_Iterator", init<ArraySlot<stype>&>()) \
.def("__iter__", &_ArraySlotIterator<stype>::__iter__) \
.def("next", &_ArraySlotIterator<stype>::next) \
; \