summaryrefslogtreecommitdiffstats
path: root/recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch')
-rw-r--r--recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch59
1 files changed, 28 insertions, 31 deletions
diff --git a/recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch b/recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch
index 310bfa47..24fd0409 100644
--- a/recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch
+++ b/recipes-extended/ceph/ceph/0001-fix-host-library-paths-were-used.patch
@@ -15,12 +15,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 src/pybind/rgw/setup.py | 6 +++++- 15 src/pybind/rgw/setup.py | 6 +++++-
16 4 files changed, 20 insertions(+), 4 deletions(-) 16 4 files changed, 20 insertions(+), 4 deletions(-)
17 17
18diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py 18Index: ceph-18.2.0/src/pybind/cephfs/setup.py
19index c9a25ccf..972f936c 100755 19===================================================================
20--- a/src/pybind/cephfs/setup.py 20--- ceph-18.2.0.orig/src/pybind/cephfs/setup.py
21+++ b/src/pybind/cephfs/setup.py 21+++ ceph-18.2.0/src/pybind/cephfs/setup.py
22@@ -63,9 +63,13 @@ def get_python_flags(libs): 22@@ -63,9 +63,13 @@
23 distutils.sysconfig.get_config_vars('LIBS', 'SYSLIBS')), []) 23 filter(lambda lib: lib.startswith('-l'), py_libs)]
24 compiler = new_compiler() 24 compiler = new_compiler()
25 distutils.sysconfig.customize_compiler(compiler) 25 distutils.sysconfig.customize_compiler(compiler)
26+ libpl = distutils.sysconfig.get_config_var('LIBPL') 26+ libpl = distutils.sysconfig.get_config_var('LIBPL')
@@ -31,15 +31,15 @@ index c9a25ccf..972f936c 100755
31 include_dirs=[distutils.sysconfig.get_python_inc()], 31 include_dirs=[distutils.sysconfig.get_python_inc()],
32- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'), 32- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
33+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl], 33+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl],
34 libraries=libs + [lib.replace('-l', '') for lib in py_libs], 34 libraries=libs + py_libs,
35 extra_compile_args=filter_unsupported_flags( 35 extra_compile_args=filter_unsupported_flags(
36 compiler.compiler[0], 36 compiler.compiler[0],
37diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py 37Index: ceph-18.2.0/src/pybind/rados/setup.py
38index 4e99d267..de24f766 100755 38===================================================================
39--- a/src/pybind/rados/setup.py 39--- ceph-18.2.0.orig/src/pybind/rados/setup.py
40+++ b/src/pybind/rados/setup.py 40+++ ceph-18.2.0/src/pybind/rados/setup.py
41@@ -66,9 +66,13 @@ def get_python_flags(libs): 41@@ -62,9 +62,13 @@
42 distutils.sysconfig.get_config_vars('LIBS', 'SYSLIBS')), []) 42 filter(lambda lib: lib.startswith('-l'), py_libs)]
43 compiler = new_compiler() 43 compiler = new_compiler()
44 distutils.sysconfig.customize_compiler(compiler) 44 distutils.sysconfig.customize_compiler(compiler)
45+ libpl = distutils.sysconfig.get_config_var('LIBPL') 45+ libpl = distutils.sysconfig.get_config_var('LIBPL')
@@ -50,15 +50,15 @@ index 4e99d267..de24f766 100755
50 include_dirs=[distutils.sysconfig.get_python_inc()], 50 include_dirs=[distutils.sysconfig.get_python_inc()],
51- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'), 51- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
52+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl], 52+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl],
53 libraries=libs + [lib.replace('-l', '') for lib in py_libs], 53 libraries=libs + py_libs,
54 extra_compile_args=filter_unsupported_flags( 54 extra_compile_args=filter_unsupported_flags(
55 compiler.compiler[0], 55 compiler.compiler[0],
56diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py 56Index: ceph-18.2.0/src/pybind/rbd/setup.py
57index f5bbbdab..a1f70e1d 100755 57===================================================================
58--- a/src/pybind/rbd/setup.py 58--- ceph-18.2.0.orig/src/pybind/rbd/setup.py
59+++ b/src/pybind/rbd/setup.py 59+++ ceph-18.2.0/src/pybind/rbd/setup.py
60@@ -63,9 +63,13 @@ def get_python_flags(libs): 60@@ -63,9 +63,13 @@
61 distutils.sysconfig.get_config_vars('LIBS', 'SYSLIBS')), []) 61 filter(lambda lib: lib.startswith('-l'), py_libs)]
62 compiler = new_compiler() 62 compiler = new_compiler()
63 distutils.sysconfig.customize_compiler(compiler) 63 distutils.sysconfig.customize_compiler(compiler)
64+ libpl = distutils.sysconfig.get_config_var('LIBPL') 64+ libpl = distutils.sysconfig.get_config_var('LIBPL')
@@ -69,15 +69,15 @@ index f5bbbdab..a1f70e1d 100755
69 include_dirs=[distutils.sysconfig.get_python_inc()], 69 include_dirs=[distutils.sysconfig.get_python_inc()],
70- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'), 70- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
71+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl], 71+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl],
72 libraries=libs + [lib.replace('-l', '') for lib in py_libs], 72 libraries=libs + py_libs,
73 extra_compile_args=filter_unsupported_flags( 73 extra_compile_args=filter_unsupported_flags(
74 compiler.compiler[0], 74 compiler.compiler[0],
75diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py 75Index: ceph-18.2.0/src/pybind/rgw/setup.py
76index b9f2428c..f5119f73 100755 76===================================================================
77--- a/src/pybind/rgw/setup.py 77--- ceph-18.2.0.orig/src/pybind/rgw/setup.py
78+++ b/src/pybind/rgw/setup.py 78+++ ceph-18.2.0/src/pybind/rgw/setup.py
79@@ -64,9 +64,13 @@ def get_python_flags(libs): 79@@ -64,9 +64,13 @@
80 distutils.sysconfig.get_config_vars('LIBS', 'SYSLIBS')), []) 80 filter(lambda lib: lib.startswith('-l'), py_libs)]
81 compiler = new_compiler() 81 compiler = new_compiler()
82 distutils.sysconfig.customize_compiler(compiler) 82 distutils.sysconfig.customize_compiler(compiler)
83+ libpl = distutils.sysconfig.get_config_var('LIBPL') 83+ libpl = distutils.sysconfig.get_config_var('LIBPL')
@@ -88,9 +88,6 @@ index b9f2428c..f5119f73 100755
88 include_dirs=[distutils.sysconfig.get_python_inc()], 88 include_dirs=[distutils.sysconfig.get_python_inc()],
89- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'), 89- library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
90+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl], 90+ library_dirs=[distutils.sysconfig.get_config_var('LIBDIR'), libpl],
91 libraries=libs + [lib.replace('-l', '') for lib in py_libs], 91 libraries=libs + py_libs,
92 extra_compile_args=filter_unsupported_flags( 92 extra_compile_args=filter_unsupported_flags(
93 compiler.compiler[0], 93 compiler.compiler[0],
94--
952.21.0
96
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-22 12:23:16 +0000