diff options
| author |   Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-09-16 17:45:29 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2016-09-18 15:28:06 +0200 |
| commit | 21d94c197db7c2bc2a0dba96bbba45c585287fe5 (patch) | |
| tree | 0954fd4e170044b51b6352f98e6d2b870d8188aa | |
| parent | dev-python/pmw: remove unused patches (diff) | |
| download | gentoo-21d94c19.tar.gz gentoo-21d94c19.tar.bz2 gentoo-21d94c19.zip | |
dev-python/protobuf-python: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/2343
Signed-off-by: David Seifert <soap@gentoo.org>
| -rw-r--r-- | dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch deleted file mode 100644 index 3d419ba3d194..000000000000 --- a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur python/setup.py python/setup.py ---- python/setup.py 2015-12-30 22:21:46.000000000 +0100 -+++ python/setup.py 2016-04-18 00:51:49.490809789 +0200 -@@ -169,14 +169,26 @@ - extra_compile_args.append('-Werror') - sys.argv.remove(warnings_as_errors) - -+ inclD = ['.', '../src'] -+ libD = [] -+ try: -+ subprocess.check_call(['pkg-config', '--exists', 'protobuf']) -+ inclD += subprocess.check_output(['pkg-config','--variable=includedir','protobuf']).split() -+ libD = subprocess.check_output(['pkg-config','--variable=libdir','protobuf']).split() -+ except OSError as osex: -+ if osex.errno == errno.ENOENT: -+ info('pkg-config not found') -+ else: -+ warn("Running pkg-config failed - %s." % osexception) -+ libD = ['../src/.libs'] - # C++ implementation extension - ext_module_list.append( - Extension( - "google.protobuf.pyext._message", - glob.glob('google/protobuf/pyext/*.cc'), -- include_dirs=[".", "../src"], -+ include_dirs=inclD, - libraries=['protobuf'], -- library_dirs=['../src/.libs'], -+ library_dirs=libD, - extra_compile_args=extra_compile_args, - ) - ) |