summaryrefslogtreecommitdiff
path: root/dev-python/PyECLib/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/PyECLib/files')
-rw-r--r--dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch11
-rw-r--r--dev-python/PyECLib/files/PyECLib-usr-local.patch83
-rw-r--r--dev-python/PyECLib/files/PyECLib-usr-local2.patch51
3 files changed, 0 insertions, 145 deletions
diff --git a/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch b/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch
deleted file mode 100644
index 9f12a56cf19a..000000000000
--- a/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py 2015-04-15 18:13:08.000000000 -0500
-+++ setup.py.new 2015-08-04 20:36:06.236656803 -0500
-@@ -66,7 +66,7 @@
- default_include_paths = [default_python_incdir,
- '/usr/local/include', '/usr/local/include/jerasure',
- '/usr/include', 'src/c/pyeclib_c',
-- '/usr/local/include']
-+ '/usr/include/liberasurecode', '/usr/local/include']
-
- libflags = ''
- includeflags = ''
diff --git a/dev-python/PyECLib/files/PyECLib-usr-local.patch b/dev-python/PyECLib/files/PyECLib-usr-local.patch
deleted file mode 100644
index 2d923b226cdd..000000000000
--- a/dev-python/PyECLib/files/PyECLib-usr-local.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- setup.py 2015-08-26 16:11:51.163684633 -0500
-+++ setup.py.new 2015-08-26 16:14:24.203682415 -0500
-@@ -55,18 +55,16 @@
- # and Tushar) cannot explain what is going on with
- # distutils or libtool here.
- #
--standard_library_paths = [('%s/usr/local/lib' % _exec_prefix),
-- '/lib', '/usr/lib', '/usr/local/lib']
-+standard_library_paths = [('%s/usr/lib' % _exec_prefix),
-+ '/lib', '/usr/lib']
-
- default_library_paths = [default_python_libdir,
-- ('%s/usr/local/lib' % _exec_prefix),
-- '/lib', '/usr/lib', '/usr/local/lib',
-- 'src/c/liberasurecode-1.0.7/src/.libs']
-+ ('%s/usr/lib' % _exec_prefix),
-+ '/lib', '/usr/lib']
-
- default_include_paths = [default_python_incdir,
-- '/usr/local/include', '/usr/local/include/jerasure',
-- '/usr/include', 'src/c/pyeclib_c',
-- '/usr/include/liberasurecode', '/usr/local/include']
-+ '/usr/include', '/usr/include/jerasure', 'src/c/pyeclib_c',
-+ '/usr/include', '/usr/include/liberasurecode']
-
- libflags = ''
- includeflags = ''
-@@ -131,8 +129,9 @@
- if (os.path.isdir(locallibsrcdir)):
- # patch default include, lib paths
- topdir = os.getcwd()
-- libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
-- (topdir + "/" + locallibsrcdir + "/src/.libs ")]
-+ libdirs = []
-+ libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
-+ (topdir + "/" + locallibsrcdir + "/src/.libs ")]
- for d in libdirs:
- libflags = libflags + " -L" + d
- default_library_paths.append(d)
-@@ -148,7 +147,7 @@
- statefile = "." + library + "_configured"
- if (not os.path.isfile(statefile)):
- configure_cmd = ("CFLAGS=\"%s\" LDFLAGS=\"%s\" " % (includeflags, libflags))
-- configure_cmd = ("%s ./configure --prefix=%s/usr/local" % \
-+ configure_cmd = ("%s ./configure --prefix=%s/usr" % \
- (configure_cmd, installroot))
- print(configure_cmd)
- retval = os.system(configure_cmd)
-@@ -218,7 +217,7 @@
- "http://lab.jerasure.org/jerasure/jerasure.git",
- "install", self.distribution)
- installroot = _get_installroot(self.distribution)
-- default_library_paths.insert(0, "%s/usr/local/lib" % installroot)
-+ default_library_paths.insert(0, "%s/usr/lib" % installroot)
- _install.run(self)
-
- # Another Mac-ism... If the libraries are installed
-@@ -231,13 +230,13 @@
- print("***************************************************")
- print("** ")
- print("** PyECLib libraries have been installed to: ")
-- print("** %susr/local/lib" % installroot)
-+ print("** %susr/lib" % installroot)
- print("** ")
- print("** Any user using this library must update: ")
- print("** %s" % ldpath_str)
- print("** ")
- print("** Run 'ldconfig' or place this line: ")
-- print("** export %s=%s" % (ldpath_str, "%susr/local/lib"
-+ print("** export %s=%s" % (ldpath_str, "%susr/lib"
- % installroot))
- print("** ")
- print("** into .bashrc, .profile, or the appropriate shell")
-@@ -256,8 +255,7 @@
- libraries=['erasurecode'],
- # The extra arguments are for debugging
- # extra_compile_args=['-g', '-O0'],
-- extra_link_args=['-Wl,-rpath,%s' %
-- l for l in default_library_paths],
-+ extra_link_args=[],
- sources=['src/c/pyeclib_c/pyeclib_c.c'])
-
- setup(name='PyECLib',
diff --git a/dev-python/PyECLib/files/PyECLib-usr-local2.patch b/dev-python/PyECLib/files/PyECLib-usr-local2.patch
deleted file mode 100644
index c0b23d477416..000000000000
--- a/dev-python/PyECLib/files/PyECLib-usr-local2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- setup.py 2015-08-27 14:33:44.643517647 -0500
-+++ setup.py.new 2015-08-27 14:34:05.202517349 -0500
-@@ -60,13 +60,12 @@
-
- default_library_paths = [default_python_libdir,
- ('%s/usr/local/lib' % _exec_prefix),
-- '/lib', '/usr/lib', '/usr/local/lib',
-- 'src/c/liberasurecode-1.0.7/src/.libs']
-+ '/lib', '/usr/lib', '/usr/local/lib']
-
- default_include_paths = [default_python_incdir,
- '/usr/local/include', '/usr/local/include/jerasure',
- '/usr/include', 'src/c/pyeclib_c',
-- '/usr/local/include']
-+ '/usr/include/liberasurecode', '/usr/local/include']
-
- libflags = ''
- includeflags = ''
-@@ -120,6 +119,7 @@
- if (os.path.isfile(library_file_path)):
- missing = False
- break
-+ missing = False
- if missing:
- # try using an integrated copy of the library
- srcpath = "src/c/"
-@@ -228,24 +228,6 @@
- ldpath_str = "DYLD_LIBRARY_PATH"
- else:
- ldpath_str = "LD_LIBRARY_PATH"
-- print("***************************************************")
-- print("** ")
-- print("** PyECLib libraries have been installed to: ")
-- print("** %susr/local/lib" % installroot)
-- print("** ")
-- print("** Any user using this library must update: ")
-- print("** %s" % ldpath_str)
-- print("** ")
-- print("** Run 'ldconfig' or place this line: ")
-- print("** export %s=%s" % (ldpath_str, "%susr/local/lib"
-- % installroot))
-- print("** ")
-- print("** into .bashrc, .profile, or the appropriate shell")
-- print("** start-up script! Also look at ldconfig(8) man ")
-- print("** page for a more static LD configuration ")
-- print("** ")
-- print("***************************************************")
--
-
- module = Extension('pyeclib_c',
- define_macros=[('MAJOR VERSION', '0'),
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-09 11:55:05 +0000