diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py index b8019f4cb9..8d743505e0 100644 --- a/programming/language/python/sip/actions.py +++ b/programming/language/python/sip/actions.py @@ -12,34 +12,13 @@ from pisi.actionsapi import get WorkDir = "sip-%s" % get.srcVERSION() -py2dir = get.curPYTHON() -py3dir = "python3.4" def setup(): - shelltools.cd("..") - shelltools.makedirs("build_python3") - shelltools.copytree("./%s" % WorkDir, "build_python3") - shelltools.cd(WorkDir) pythonmodules.run('configure.py CFLAGS+="%s" CXXFLAGS+="%s"' % (get.CFLAGS(), get.CXXFLAGS())) - shelltools.cd("../build_python3/%s" % WorkDir) - shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") - pythonmodules.run('configure.py CFLAGS="%s" CXXFLAGS="%s"' % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") - - def build(): autotools.make() - shelltools.cd("../build_python3/%s" % WorkDir) - autotools.make() - def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) 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.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/files/disable-rpaths.diff b/programming/language/python/sip/files/disable-rpaths.diff deleted file mode 100644 index 7aab12987a..0000000000 --- a/programming/language/python/sip/files/disable-rpaths.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- siputils.py -+++ siputils.py -@@ -737,6 +737,7 @@ class Makefile: - rpaths is the cannonical list of rpaths. - """ - flags = [] -+ return flags - prefix = self.optional_string("RPATH") - - if prefix: diff --git a/programming/language/python/sip/files/fix-linking.diff b/programming/language/python/sip/files/fix-linking.diff deleted file mode 100644 index e97281a507..0000000000 --- a/programming/language/python/sip/files/fix-linking.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- specs/linux-g++ 2009/08/31 11:59:37 1.1 -+++ specs/linux-g++ 2009/08/31 12:00:19 -@@ -53,7 +53,7 @@ - QMAKE_LFLAGS = - QMAKE_LFLAGS_RELEASE = - QMAKE_LFLAGS_DEBUG = --QMAKE_LFLAGS_SHLIB = -shared -+QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = diff --git a/programming/language/python/sip/files/no-strip.patch b/programming/language/python/sip/files/no-strip.patch deleted file mode 100644 index 033b54f968..0000000000 --- a/programming/language/python/sip/files/no-strip.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: sip-4.8.2/specs/linux-g++ -=================================================================== ---- sip-4.8.2.orig/specs/linux-g++ -+++ sip-4.8.2/specs/linux-g++ -@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+QMAKE_STRIP = - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p -Index: sip-4.8.2/specs/linux-lsb -=================================================================== ---- sip-4.8.2.orig/specs/linux-lsb -+++ sip-4.8.2/specs/linux-lsb -@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+QMAKE_STRIP = - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/programming/language/python/sip/files/sip-outoftree.patch b/programming/language/python/sip/files/sip-outoftree.patch deleted file mode 100644 index d394a9dcf6..0000000000 --- a/programming/language/python/sip/files/sip-outoftree.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- sip-4.16.3/configure.py.orig 2014-09-11 19:12:51.000000000 +0200 -+++ sip-4.16.3/configure.py 2014-10-27 17:54:50.981640566 +0100 -@@ -47,6 +47,7 @@ - sip_sip_dir = '' - sysroot = '' - src_dir = os.path.dirname(os.path.abspath(__file__)) -+build_dir = os.getcwd() - sip_module_base = None - build_platform = None - ---- sip-4.16.3/siputils.py.orig 2014-09-07 17:30:09.000000000 +0200 -+++ sip-4.16.3/siputils.py 2014-10-27 22:19:01.287642057 +0100 -@@ -202,7 +202,7 @@ - def __init__(self, configuration, console=0, qt=0, opengl=0, python=0, - threaded=0, warnings=1, debug=0, dir=None, - makefile="Makefile", installs=None, universal=None, -- arch=None, deployment_target=None): -+ arch=None, deployment_target=None, src_dir=None): - """Initialise an instance of the target. All the macros are left - unchanged allowing scripts to manipulate them at will. - -@@ -264,8 +264,11 @@ - else: - self.dir = os.path.curdir - -- # Assume we are building in the source tree. -- self._src_dir = self.dir -+ if src_dir is not None: -+ self._src_dir = src_dir -+ else: -+ # Assume we are building in the source tree. -+ self._src_dir = self.dir - - if universal is None: - self._universal = configuration.universal -@@ -381,6 +381,8 @@ - defines.extend(self.optional_list("DEFINES")) - - incdir = _UniqueList(["."]) -+ if self.dir != self._src_dir: -+ incdir.append(self._src_dir) - incdir.extend(self.extra_include_dirs) - incdir.extend(self.optional_list("INCDIR")) - -@@ -1029,7 +1031,8 @@ - else: - if os.path.isabs(filename): - # We appear to be building out of the source tree. -- self._src_dir = os.path.dirname(filename) -+ if self._src_dir == self.dir: -+ self._src_dir = os.path.dirname(filename) - bfname = filename - else: - bfname = os.path.join(self.dir, filename) -@@ -1465,7 +1471,7 @@ - console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, - dir=None, makefile="Makefile", installs=None, strip=1, - export_all=0, universal=None, arch=None, -- deployment_target=None): -+ deployment_target=None, src_dir=None): - """Initialise an instance of a module Makefile. - - build_file is the file containing the target specific information. If -@@ -1479,7 +1485,7 @@ - increases the size of the module and slows down module load times but - may avoid problems with modules that use exceptions. The default is 0. - """ -- Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch, deployment_target) -+ Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch, deployment_target, src_dir) - - self._build = self.parse_build_file(build_file) - self._install_dir = install_dir - \ No newline at end of file