From 9bdeb0e7b787a98be60d0c57361557679a2a4fbf Mon Sep 17 00:00:00 2001 From: Marshall Brewer Date: Fri, 3 Jun 2016 19:51:03 +0200 Subject: dev-python/protobuf-python: version bump 3.0.0_beta3 Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1603 Signed-off-by: Patrice Clement --- ...uf-3.0.0_beta2-link-against-installed-lib.patch | 32 --------------------- ...on-3.0.0_beta2-link-against-installed-lib.patch | 32 +++++++++++++++++++++ ...on-3.0.0_beta3-link-against-installed-lib.patch | 33 ++++++++++++++++++++++ 3 files changed, 65 insertions(+), 32 deletions(-) delete mode 100644 dev-python/protobuf-python/files/protobuf-3.0.0_beta2-link-against-installed-lib.patch create mode 100644 dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch create mode 100644 dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch (limited to 'dev-python/protobuf-python/files') diff --git a/dev-python/protobuf-python/files/protobuf-3.0.0_beta2-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-3.0.0_beta2-link-against-installed-lib.patch deleted file mode 100644 index 3d419ba3d194..000000000000 --- a/dev-python/protobuf-python/files/protobuf-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, - ) - ) 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 new file mode 100644 index 000000000000..3d419ba3d194 --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta2-link-against-installed-lib.patch @@ -0,0 +1,32 @@ +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, + ) + ) diff --git a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch new file mode 100644 index 000000000000..cb4a5f6cf7eb --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch @@ -0,0 +1,33 @@ +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 +@@ -190,15 +190,27 @@ + 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." % osex) ++ libD = ['../src/.libs'] + # C++ implementation extension + ext_module_list.extend([ + Extension( + "google.protobuf.pyext._message", + glob.glob('google/protobuf/pyext/*.cc'), +- include_dirs=[".", "../src"], ++ include_dirs=inclD, + libraries=libraries, + extra_objects=extra_objects, +- library_dirs=['../src/.libs'], ++ library_dirs=libD, + extra_compile_args=extra_compile_args, + ), + Extension( -- cgit v1.2.3