mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 08:58:27 -07:00
dev-python/protobuf-python: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/2343 Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
committed by
David Seifert
parent
a7cf0e391a
commit
21d94c197d
@@ -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,
|
||||
)
|
||||
)
|
||||
Reference in New Issue
Block a user