From: Ilsoo Byun <ilsoobyun@linecorp.com>
Date: Fri, 6 Sep 2019 04:50:31 +0000 (+0900)
Subject: build/ops: fix build fail related to PYTHON_EXECUTABLE variable
X-Git-Tag: v14.2.5~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6db5d8a2013f24fb4a76bed13519a46a0c707e7d;p=ceph.git

build/ops: fix build fail related to PYTHON_EXECUTABLE variable

Fixes: https://tracker.ceph.com/issues/41676
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit d8251aa2139b75452371409c1bd27fec2f7f1774)
---

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 326facb9e25..d83a59b2c56 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -325,7 +325,7 @@
 /* Define if endian type is little endian */
 #cmakedefine CEPH_LITTLE_ENDIAN
 
-#cmakedefine PYTHON_EXECUTABLE "@MGR_PYTHON_EXECUTABLE@"
+#cmakedefine MGR_PYTHON_EXECUTABLE "@MGR_PYTHON_EXECUTABLE@"
 
 /* Define to 1 if you have the `getprogname' function. */
 #cmakedefine HAVE_GETPROGNAME 1
diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc
index 061a92c6c7c..ad275e38d46 100644
--- a/src/mgr/PyModuleRegistry.cc
+++ b/src/mgr/PyModuleRegistry.cc
@@ -41,10 +41,10 @@ void PyModuleRegistry::init()
   // Set up global python interpreter
 #if PY_MAJOR_VERSION >= 3
 #define WCHAR(s) L ## #s
-  Py_SetProgramName(const_cast<wchar_t*>(WCHAR(PYTHON_EXECUTABLE)));
+  Py_SetProgramName(const_cast<wchar_t*>(WCHAR(MGR_PYTHON_EXECUTABLE)));
 #undef WCHAR
 #else
-  Py_SetProgramName(const_cast<char*>(PYTHON_EXECUTABLE));
+  Py_SetProgramName(const_cast<char*>(MGR_PYTHON_EXECUTABLE));
 #endif
   // Add more modules
   if (g_conf().get_val<bool>("daemonize")) {