diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py index e9ae2bd32d..4ef8232360 100644 --- a/programming/language/python/sip/actions.py +++ b/programming/language/python/sip/actions.py @@ -16,23 +16,16 @@ py2dir = get.curPYTHON() py3dir = "python3.4" def setup(): - #shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") + shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") shelltools.cd("..") shelltools.makedirs("build_python3") shelltools.copytree("./%s" % WorkDir, "build_python3") shelltools.cd(WorkDir) - pythonmodules.run('configure.py \ - -b /usr/bin \ - -d /usr/lib/%s/site-packages \ - -e /usr/include/%s/ \ - CFLAGS+="%s" CXXFLAGS+="%s"' % (py2dir, py2dir, get.CFLAGS(), get.CXXFLAGS())) + pythonmodules.run('configure.py CFLAGS+="%s" CXXFLAGS+="%s"' % (get.CFLAGS(), get.CXXFLAGS())) shelltools.cd("../build_python3/%s" % WorkDir) - pythonmodules.run('configure.py \ - -b /usr/bin \ - -d /usr/lib/%s/site-packages/ \ - -e /usr/include/%sm/ \ - CFLAGS="%s" CXXFLAGS="%s"' % (py3dir, py3dir, get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") + pythonmodules.run('configure.py CFLAGS="%s" CXXFLAGS="%s"' % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") + def build(): autotools.make() @@ -42,11 +35,11 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.rename("/usr/bin/sip", "python2-sip") - pisitools.insinto("/usr/lib/python3.5/site-packages", "sipconfig.py") - pisitools.insinto("/usr/lib/python3.5/site-packages", "sipdistutils.py") + pisitools.rename("/usr/bin/sip", "py2sip") + #pisitools.insinto("/usr/lib/python2.7/site-packages", "siputils.py") + #pisitools.insinto("/usr/lib/python2.7/site-packages", "sipdistutils.py") shelltools.cd("../build_python3/%s" % WorkDir) autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.insinto("/usr/lib/python3.5/site-packages", "sipconfig.py") - pisitools.insinto("/usr/lib/python3.5/site-packages", "sipdistutils.py") \ No newline at end of file + #pisitools.insinto("/usr/lib/python3.4/site-packages", "siputils.py") + #pisitools.insinto("/usr/lib/python3.4/site-packages", "sipdistutils.py") \ No newline at end of file diff --git a/programming/language/python/sip/pspec.xml b/programming/language/python/sip/pspec.xml index e75afcba87..774fd4d3f9 100644 --- a/programming/language/python/sip/pspec.xml +++ b/programming/language/python/sip/pspec.xml @@ -10,19 +10,15 @@ app:console SIP is a tool for generating bindings for C++ classes so that they can be used by Python SIP is a tool for generating bindings for C and C++ libraries so that they can be used by Python. It takes any C or C++ libraries and converts them into Python extension modules. - - python3-devel - python-devel - mirrors://sourceforge/pyqt/sip-4.16.9.tar.gz - qt5-base-devel + qt5-base-devel - no-strip.patch + @@ -41,6 +37,9 @@ + + python3-devel + python3-sip /usr/lib/python3* @@ -57,6 +56,9 @@ python-sip Python 2.x SIP bindings for C and C++ libraries + + python-devel + libgcc python