commit:     21d94c197db7c2bc2a0dba96bbba45c585287fe5
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail 
<DOT> com>
AuthorDate: Fri Sep 16 15:45:29 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 13:28:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d94c19

dev-python/protobuf-python: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/2343

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...on-3.0.0_beta2-link-against-installed-lib.patch | 32 ----------------------
 1 file changed, 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 3d419ba..00000000
--- 
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,
-         )
-     )

Reply via email to