diff options
| author | Denis Kozadaev <denis@dilos.org> | 2020-01-30 22:13:12 +0300 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-03-08 16:07:42 +0100 |
| commit | 6afe8a64d1c0c7e6b78716c12bf85920ba36fed6 (patch) | |
| tree | 59ef0a97e2d071e6b5d2bada82e564e0654c2273 /dilos/libraries/pytdeextensions/debian/patches | |
| parent | d95f668ce515671582aa4fc157bab9da87b3b728 (diff) | |
| download | tde-packaging-6afe8a64d1c0c7e6b78716c12bf85920ba36fed6.tar.gz tde-packaging-6afe8a64d1c0c7e6b78716c12bf85920ba36fed6.zip | |
DilOS: pytdeextensions build pack
Signed-off-by: Denis Kozadaev <denis@dilos.org>
Diffstat (limited to 'dilos/libraries/pytdeextensions/debian/patches')
4 files changed, 57 insertions, 0 deletions
diff --git a/dilos/libraries/pytdeextensions/debian/patches/.gitignore b/dilos/libraries/pytdeextensions/debian/patches/.gitignore new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/dilos/libraries/pytdeextensions/debian/patches/.gitignore diff --git a/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff new file mode 100644 index 000000000..3a65ff190 --- /dev/null +++ b/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff @@ -0,0 +1,15 @@ +Index: b/src/tdedistutils.py +=================================================================== +--- a/src/tdedistutils.py ++++ b/src/tdedistutils.py +@@ -2272,7 +2272,7 @@ + + ########################################################################### + def get_libdir_name(): +- if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']: +- return 'lib64' +- else: ++ #if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']: ++ # return 'lib64' ++ #else: + return 'lib' diff --git a/dilos/libraries/pytdeextensions/debian/patches/dilos.patch b/dilos/libraries/pytdeextensions/debian/patches/dilos.patch new file mode 100644 index 000000000..46c8081d6 --- /dev/null +++ b/dilos/libraries/pytdeextensions/debian/patches/dilos.patch @@ -0,0 +1,40 @@ +Index: pytdeextensions/setup.py +=================================================================== +--- pytdeextensions.orig/setup.py ++++ pytdeextensions/setup.py +@@ -126,7 +126,7 @@ class BuildLibpythonize(Command): + + # Find the C library (libgcc, libgcc_s or some other variation). + if self.clib is None: +- canidatepaths = ["/usr/"+tdedistutils.get_libdir_name(), "/usr/local/"+tdedistutils.get_libdir_name(), "/usr/lib" ] ++ canidatepaths = ["/usr/"+tdedistutils.get_libdir_name(), "/usr/local/"+tdedistutils.get_libdir_name(), "/usr/lib", os.environ["GCCLIBDIR"] ] + self.clib = tdedistutils.FindFileInPaths("libgcc*.so",canidatepaths) + if self.clib!=None: + self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0] +@@ -156,7 +156,7 @@ class BuildLibpythonize(Command): + + cppfile = "src/pythonize.cpp" + # Compile the library. +- cmdlist = ['libtool'] ++ cmdlist = ['debian/dilos/libtool'] + + # Couldn't get it to pass without this ... + cmdlist.append("--mode=compile") +@@ -205,7 +205,7 @@ class BuildLibpythonize(Command): + print + + # Link the resulting object file to create a shared library. +- cmdlist = ['libtool'] ++ cmdlist = ['debian/dilos/libtool'] + cmdlist.append("--mode=link") + cmdlist.append("--tag=LD") + +@@ -291,7 +291,7 @@ class InstallLibpythonize(Command): + self.outfiles.extend(self.mkpath(self.install_dir)) + + # Install the library. +- cmdlist = ['libtool'] ++ cmdlist = ['debian/dilos/libtool'] + cmdlist.append("--mode=install") + cmdlist.append(self.install_cmd) + cmdlist.append("-c") diff --git a/dilos/libraries/pytdeextensions/debian/patches/series b/dilos/libraries/pytdeextensions/debian/patches/series new file mode 100644 index 000000000..1f10bdc94 --- /dev/null +++ b/dilos/libraries/pytdeextensions/debian/patches/series @@ -0,0 +1,2 @@ +11_fix_get_libdir_name.diff +dilos.patch |