25e244f568
- Update to 2.0.0-1 - See RELEASE_NOTES for a complete list of changes - Add opae-support-OBS-build.patch to fix compilation using system packages (cli11, pybind11) instead of git clones - Refresh opae-missing-shebang.patch against latest sources - Update opae-fix-linking-issue.patch to fix pybind11 link LTO issues OBS-URL: https://build.opensuse.org/request/show/888753 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opae?expand=0&rev=23
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
commit b9cec3efbc585d0b7a3f4afb53cb93098ff64332
|
|
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
|
Date: Fri Apr 17 11:09:52 2020 +0200
|
|
|
|
opae: fix linking issue
|
|
|
|
Add missing -lopae-c for libopaecxx
|
|
|
|
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
|
|
|
diff --git opae-libs/libopaecxx/CMakeLists.txt opae-libs/libopaecxx/CMakeLists.txt
|
|
index 38d6124b0c98..2610278ca437 100644
|
|
--- opae-libs/libopaecxx/CMakeLists.txt
|
|
+++ opae-libs/libopaecxx/CMakeLists.txt
|
|
@@ -43,6 +43,7 @@ opae_add_shared_library(TARGET opae-cxx-core
|
|
VERSION ${OPAE_VERSION}
|
|
SOVERSION ${OPAE_VERSION_MAJOR}
|
|
COMPONENT opaecxxcorelib
|
|
+ LIBS opae-c
|
|
)
|
|
|
|
opae_add_executable(TARGET hello_cxxcore
|
|
diff --git tools/extra/fpgadiag/CMakeLists.txt tools/extra/fpgadiag/CMakeLists.txt
|
|
index 00acc11bae32..4e6048ce3fab 100644
|
|
--- tools/extra/fpgadiag/CMakeLists.txt
|
|
+++ tools/extra/fpgadiag/CMakeLists.txt
|
|
@@ -42,7 +42,8 @@ opae_add_shared_library(TARGET opae-c++-nlb
|
|
diag_utils.cpp
|
|
LIBS
|
|
opae-c
|
|
- opae-cxx-core
|
|
+ opae-cxx-core
|
|
+ opae-c++-utils
|
|
VERSION ${OPAE_VERSION}
|
|
SOVERSION ${OPAE_VERSION_MAJOR}
|
|
COMPONENT opaecxxnlb
|
|
@@ -126,7 +127,6 @@ if (SUPPORTS_VFIO)
|
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
|
|
set_source_files_properties(eth_group.cpp PROPERTIES COMPILE_FLAGS -fno-lto)
|
|
endif()
|
|
- pybind11_add_module(eth_group THIN_LTO eth_group.cpp)
|
|
else(SUPPORTS_VFIO)
|
|
message(WARNING
|
|
"Could not compile VFIO. See errors in vfio_errors.txt")
|