]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw/lua: add lib64 to the package search path
authorYuval Lifshitz <yuvalif@yahoo.com>
Thu, 11 May 2023 18:59:32 +0000 (21:59 +0300)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Tue, 20 Aug 2024 12:44:09 +0000 (19:44 +0700)
Fixes: https://tracker.ceph.com/issues/59733
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
(cherry picked from commit 001e0c004ebb871fe09e70ba66fddbc545705c34)

src/rgw/rgw_lua_utils.cc

index 3ffe23662116eb1cbf48d04416324dc078c2b3be..accb3b3945d9b2e4258f58dcc2f74985a2a03895 100644 (file)
@@ -50,11 +50,11 @@ void set_package_path(lua_State* L, const std::string& install_dir) {
   if (!lua_istable(L, -1)) {
     return;
   }
-  const auto path = install_dir+"/share/lua/"+CEPH_LUA_VERSION+"/?.lua";  
+  const auto path = install_dir+"/share/lua/"+CEPH_LUA_VERSION+"/?.lua";
   pushstring(L, path);
   lua_setfield(L, -2, "path");
   
-  const auto cpath = install_dir+"/lib/lua/"+CEPH_LUA_VERSION+"/?.so";
+  const auto cpath = install_dir+"/lib/lua/"+CEPH_LUA_VERSION+"/?.so;"+install_dir+"/lib64/lua/"+CEPH_LUA_VERSION+"/?.so";
   pushstring(L, cpath);
   lua_setfield(L, -2, "cpath");
 }