diff options
Diffstat (limited to 'dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch')
| -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, - ) - ) |