mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-28 09:58:08 -07:00
clean up more openstack related stuff
Thanks to mm1ke for the proding
This commit is contained in:
Matthew Thode
@@ -1,2 +1 @@
|
||||
DIST PyECLib-1.0.7.tar.gz 8376329 SHA256 f2136f187900fe3b84c75fea671c9bcb3d4d4a6307e44d9f960ed8296ce52dc3 SHA512 8f1bbf6bd0c8ceb62862337fd204e497e5826e01c8b7532bd68485b2203e755144d0ac6b7ee9aa59fb290e8c9ee5fa3bd865203dbbdbf471e0112d10c3ea8720 WHIRLPOOL 62839fe028fc5a5d96005f337425773254d1fb287d4e2d02010ca9e1fb3df6e79f7a7fc4e03797d854b8965c24665dd93010623cf7bae8a5612b1c2e50513e80
|
||||
DIST PyECLib-1.2.0.tar.gz 6677880 SHA256 0f55656b4288fef1cc85978ebb8eef2e83515482f68bb1cf19903c048c9f8c9b SHA512 6413b8f48e05d96bf43d25640d68941aa17a938fba18f0fc7847e51ac75b222eeb6678ae49eba2a582220d55e253f60a1802b175134d1e138764ac1d15b5d88e WHIRLPOOL d9f14894bec43b97cbcd4bdd0f3f1cc871e8241a4c126fa5b6a3fa83e95da39cda16812e38fea815a21d318f4313c0981a019c2c3d6c874dea82122f6a359ff3
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1 eutils multilib
|
||||
|
||||
DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 x86"
|
||||
IUSE="test"
|
||||
|
||||
CDEPEND="dev-libs/jerasure"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
${CDEPEND}"
|
||||
RDEPEND="dev-libs/liberasurecode
|
||||
${CDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/PyECLib-usr-local2.patch"
|
||||
)
|
||||
@@ -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 = ''
|
||||
@@ -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',
|
||||
@@ -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'),
|
||||
Reference in New Issue
Block a user