Fix for python load errors on Linux (#5627)
* Explicitly load libpython on Linux Downstream loads of python modules that weren't linked to libpython would fail to load because libraries were loaded using the RTLD_LOCAL flag. This adds a function that will explicitly load libpython on Linux using the RTLD_GLOBAL flag. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix misspelled function name Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Addressing PR feedback - Updates naming and location of things. - Adds load code to a Gem template. - Updates error checking. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address further feedback Removes the api function in favor of just having modules inherit off a PythonLoader class, that way we get RAAI behavior and lifetime management for free. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>monroegm-disable-blank-issue-2
parent
4854023eb1
commit
6651ae3d78
@ -0,0 +1,25 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace AzToolsFramework::EmbeddedPython
|
||||||
|
{
|
||||||
|
// When using embedded Python, some platforms need to explicitly load the python library.
|
||||||
|
// For any modules that depend on 3rdParty::Python package, the AZ::Module should inherit this class.
|
||||||
|
class PythonLoader
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
PythonLoader();
|
||||||
|
~PythonLoader();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void* m_embeddedLibPythonHandle{ nullptr };
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace AzToolsFramework::EmbeddedPython
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <AzToolsFramework/API/PythonLoader.h>
|
||||||
|
|
||||||
|
namespace AzToolsFramework::EmbeddedPython
|
||||||
|
{
|
||||||
|
PythonLoader::PythonLoader()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
PythonLoader::~PythonLoader()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <AzToolsFramework/API/PythonLoader.h>
|
||||||
|
#include <AzCore/Debug/Trace.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
|
||||||
|
namespace AzToolsFramework::EmbeddedPython
|
||||||
|
{
|
||||||
|
PythonLoader::PythonLoader()
|
||||||
|
{
|
||||||
|
constexpr char libPythonName[] = "libpython3.7m.so.1.0";
|
||||||
|
if (m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL);
|
||||||
|
m_embeddedLibPythonHandle == nullptr)
|
||||||
|
{
|
||||||
|
char* err = dlerror();
|
||||||
|
AZ_Error("PythonLoader", false, "Failed to load %s with error: %s\n", libPythonName, err ? err : "Unknown Error");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PythonLoader::~PythonLoader()
|
||||||
|
{
|
||||||
|
if (m_embeddedLibPythonHandle)
|
||||||
|
{
|
||||||
|
dlclose(m_embeddedLibPythonHandle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace AzToolsFramework::EmbeddedPython
|
||||||
Loading…
Reference in New Issue