Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opae for openSUSE:Factory checked in
at 2021-04-27 21:35:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opae (Old)
and /work/SRC/openSUSE:Factory/.opae.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opae"
Tue Apr 27 21:35:19 2021 rev:8 rq:888754 version:2.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opae/opae.changes 2020-04-21
13:06:26.804307227 +0200
+++ /work/SRC/openSUSE:Factory/.opae.new.12324/opae.changes 2021-04-27
21:35:48.988097792 +0200
@@ -1,0 +2,10 @@
+Wed Oct 7 09:40:19 UTC 2020 - Nicolas Morey-Chaisemartin
<nmoreychaisemar...@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
Old:
----
opae-1.4.11.0.d5921e5b6b0b.tar.bz2
New:
----
opae-2.0.01.0.776b2b2718f7.tar.bz2
opae-support-OBS-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opae.spec ++++++
--- /var/tmp/diff_new_pack.eKRFxy/_old 2021-04-27 21:35:49.596098792 +0200
+++ /var/tmp/diff_new_pack.eKRFxy/_new 2021-04-27 21:35:49.600098799 +0200
@@ -1,7 +1,7 @@
#
# spec file for package opae
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,16 +20,16 @@
%define with_tests 0
%define with_legacy 0
-%define git_ver 1.0.d5921e5b6b0b
-%define lib_opae_major 1
+%define git_ver 1.0.776b2b2718f7
+%define lib_opae_major 2
%define lib_hssi_major 1
%define lib_ase_major 1
-%define lib_bitstream_major 1
+%define lib_bitstream_major 2
%define lib_fpgad_major 1
%define lib_board_major 1
Name: opae
-Version: 1.4.1
+Version: 2.0.0
Release: 0
Summary: Open Programmable Acceleration Engine
License: Intel OR MIT
@@ -38,20 +38,26 @@
Source0: %{name}-%{version}%{git_ver}.tar.bz2
Patch0: opae-missing-shebang.patch
Patch1: opae-fix-linking-issue.patch
+Patch2: opae-support-OBS-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: boost-devel
+BuildRequires: cli11-devel
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: fdupes
+BuildRequires: fmt-devel
BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: hwloc-devel
BuildRequires: libjson-c-devel
BuildRequires: libuuid-devel
BuildRequires: ncurses-devel
+BuildRequires: python-pybind11-common-devel
BuildRequires: python3-devel
BuildRequires: python3-pybind11-devel
+BuildRequires: spdlog-devel >= 1.0
+BuildRequires: tbb-devel
#Currently *only* builds on x86_64
ExclusiveArch: x86_64
%if 0%{?with_legacy}
@@ -138,14 +144,14 @@
%setup -q -n %{name}-%{version}%{git_ver}
%patch0
%patch1
+%patch2
%build
-mkdir external/pybind11
export RPM_OPT_FLAGS
%cmake -DCMAKE_BUILD_TYPE=Release \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DCMAKE_C_FLAGS="-Wno-format-truncation
-Wno-address-of-packed-member" \
- -DOPAE_PRESERVE_REPOS=ON
+ -DOPAE_PRESERVE_REPOS=ON -DOPAE_OBS_BUILD=ON
%make_build all VERBOSE=1 %{?_smp_mflags}
%install
@@ -153,6 +159,8 @@
rm -f %{buildroot}%{_libdir}/libsafestr.a
rm -f %{buildroot}%{_libdir}/libargsfilter.a
rm -Rf %{buildroot}%{_includedir}/safe_string
+# This is used by the other .so in libdir/opae/*.so but we do not need the
static lib anymore
+rm -f %{buildroot}%{_libdir}/libboard_common.a
# Fix install path for opae samples
mkdir -p %{buildroot}%{_datarootdir}/opae/
mv %{buildroot}/usr/src/opae/samples %{buildroot}%{_datarootdir}/opae/
@@ -204,11 +212,14 @@
%if 0%{?with_tests}
%pre
%service_add_pre fpgad.service
+
%post
%service_add_post fpgad.service
%{fillup_only -n fpgad}
+
%preun
%service_del_preun fpgad.service
+
%postun
%service_del_postun fpgad.service
@@ -256,9 +267,9 @@
%{_libdir}/libopae-cxx-core*.so.%{lib_opae_major}
%{_libdir}/libopae-cxx-core*.so.%{lib_opae_major}.*
-%files -n libbitstream%{lib_hssi_major}
-%{_libdir}/libbitstream.so.%{lib_hssi_major}
-%{_libdir}/libbitstream.so.%{lib_hssi_major}.*
+%files -n libbitstream%{lib_bitstream_major}
+%{_libdir}/libbitstream.so.%{lib_bitstream_major}
+%{_libdir}/libbitstream.so.%{lib_bitstream_major}.*
%if 0%{?with_legacy}
%files -n libhssi-io%{lib_hssi_major}
@@ -267,9 +278,9 @@
%endif
%if 0%{?with_tests}
-%files -n libfpgad-api%{lib_bmc_major}
-%{_libdir}/libfpgad-api.so.%{lib_bmc_major}
-%{_libdir}/libfpgad-api.so.%{lib_bmc_major}.*
+%files -n libfpgad-api%{lib_fpgad_major}
+%{_libdir}/libfpgad-api.so.%{lib_fpgda_major}
+%{_libdir}/libfpgad-api.so.%{lib_fpgad_major}.*
%endif
%if 0%{?with_ase}
@@ -280,6 +291,7 @@
%dir %{_datarootdir}/opae
%{_datarootdir}/opae/ase
+
%files -n libase%{lib_ase_major}
%{_libdir}/libase*.so.%{lib_ase_major}
%{_libdir}/libase*.so.%{lib_ase_major}.*
++++++ _service ++++++
--- /var/tmp/diff_new_pack.eKRFxy/_old 2021-04-27 21:35:49.628098845 +0200
+++ /var/tmp/diff_new_pack.eKRFxy/_new 2021-04-27 21:35:49.632098852 +0200
@@ -8,7 +8,7 @@
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
- <param name="revision">d5921e5b6b0b48934a8964bdbd69ce4896c378e1</param>
+ <param name="revision">776b2b2718f70507ea00c4461dabe945150fc81f</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">opae*.tar</param>
++++++ opae-1.4.11.0.d5921e5b6b0b.tar.bz2 -> opae-2.0.01.0.776b2b2718f7.tar.bz2
++++++
++++ 42090 lines of diff (skipped)
++++++ opae-fix-linking-issue.patch ++++++
--- /var/tmp/diff_new_pack.eKRFxy/_old 2021-04-27 21:35:51.392101749 +0200
+++ /var/tmp/diff_new_pack.eKRFxy/_new 2021-04-27 21:35:51.392101749 +0200
@@ -1,4 +1,4 @@
-commit 05d809cab5780e79ebbbbb8c833e9f03df1b2565
+commit b9cec3efbc585d0b7a3f4afb53cb93098ff64332
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date: Fri Apr 17 11:09:52 2020 +0200
@@ -21,7 +21,7 @@
opae_add_executable(TARGET hello_cxxcore
diff --git tools/extra/fpgadiag/CMakeLists.txt
tools/extra/fpgadiag/CMakeLists.txt
-index 606bb75ff3d5..d5bd2c8283ce 100644
+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
@@ -34,3 +34,11 @@
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")
++++++ opae-missing-shebang.patch ++++++
++++ 1962 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/opae/opae-missing-shebang.patch
++++ and /work/SRC/openSUSE:Factory/.opae.new.12324/opae-missing-shebang.patch
++++++ opae-support-OBS-build.patch ++++++
commit 10e14b8f771bc38ca07b3228f791793b0e277d09
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date: Wed Oct 7 10:52:08 2020 +0200
opae: support OBS build
By default opae downloads external packages.
Add a flag that disabled this and relies on OBS/rpmbuild to have installed
the system requirements
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
diff --git external/CMakeLists.txt external/CMakeLists.txt
index 2f8487a86e89..49d345ad8b5c 100644
--- external/CMakeLists.txt
+++ external/CMakeLists.txt
@@ -26,33 +26,38 @@
cmake_minimum_required(VERSION 2.8.12)
-set(CLI11_URL
- https://github.com/CLIUtils/CLI11.git
- CACHE STRING "URL for CLI11 Project")
-set(CLI11_TAG
- v1.9.1
- CACHE STRING "Tag for CLI11")
+if (OPAE_OBS_BUILD)
+ message("================ HERE WE ARE =================")
+ find_package(CLI11 REQUIRED)
+ find_package(spdlog REQUIRED)
+else()
+ set(CLI11_URL
+ https://github.com/CLIUtils/CLI11.git
+ CACHE STRING "URL for CLI11 Project")
+ set(CLI11_TAG
+ v1.9.1
+ CACHE STRING "Tag for CLI11")
+ opae_external_project_add(PROJECT_NAME CLI11
+ GIT_URL ${CLI11_URL}
+ GIT_TAG ${CLI11_TAG}
+ PRESERVE_REPOS ${OPAE_PRESERVE_REPOS}
+ NO_ADD_SUBDIRECTORY
+ )
-opae_external_project_add(PROJECT_NAME CLI11
- GIT_URL ${CLI11_URL}
- GIT_TAG ${CLI11_TAG}
- PRESERVE_REPOS ${OPAE_PRESERVE_REPOS}
- NO_ADD_SUBDIRECTORY
-)
+ set(SPDLOG_URL
+ https://github.com/gabime/spdlog.git
+ CACHE STRING "URL for spdlog Project")
+ set(SPDLOG_TAG
+ v1.7.0
+ CACHE STRING "Tag for spdlog")
-set(SPDLOG_URL
- https://github.com/gabime/spdlog.git
- CACHE STRING "URL for spdlog Project")
-set(SPDLOG_TAG
- v1.7.0
- CACHE STRING "Tag for spdlog")
-
-opae_external_project_add(PROJECT_NAME spdlog
- GIT_URL ${SPDLOG_URL}
- GIT_TAG ${SPDLOG_TAG}
- PRESERVE_REPOS ${OPAE_PRESERVE_REPOS}
- NO_ADD_SUBDIRECTORY
-)
+ opae_external_project_add(PROJECT_NAME spdlog
+ GIT_URL ${SPDLOG_URL}
+ GIT_TAG ${SPDLOG_TAG}
+ PRESERVE_REPOS ${OPAE_PRESERVE_REPOS}
+ NO_ADD_SUBDIRECTORY
+ )
+endif()
if(OPAE_BUILD_LEGACY)
opae_external_project_add(PROJECT_NAME opae-legacy
diff --git opae-libs/CMakeLists.txt opae-libs/CMakeLists.txt
index 74ade76f9aa8..c93a39b97920 100644
--- opae-libs/CMakeLists.txt
+++ opae-libs/CMakeLists.txt
@@ -52,6 +52,9 @@ find_package(PythonLibs ${OPAE_PYTHON_VERSION})
option(OPAE_BUILD_TESTS "Enable building of OPAE unit tests" OFF)
mark_as_advanced(OPAE_BUILD_TESTS)
+option(OPAE_OBS_BUILD "Build through SUSE OBS and do not fetch remote
packages." OFF)
+mark_as_advanced(OPAE_OBS_BUILD)
+
include(OPAE)
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
diff --git opae-libs/pyopae/CMakeLists.txt opae-libs/pyopae/CMakeLists.txt
index 835f80a9efb3..0a662d9f6380 100644
--- opae-libs/pyopae/CMakeLists.txt
+++ opae-libs/pyopae/CMakeLists.txt
@@ -46,10 +46,14 @@ set(PYOPAE_SRC
pysysobject.cpp
)
-opae_external_project_add(PROJECT_NAME pybind11
- GIT_URL https://github.com/pybind/pybind11.git
- GIT_TAG v2.4.3
- )
+if (OPAE_OBS_BUILD)
+ find_package(pybind11 REQUIRED)
+else()
+ opae_external_project_add(PROJECT_NAME pybind11
+ GIT_URL https://github.com/pybind/pybind11.git
+ GIT_TAG v2.4.3
+ )
+endif()
opae_add_module_library(TARGET _opae
SOURCE ${PYOPAE_SRC}
diff --git samples/CMakeLists.txt samples/CMakeLists.txt
index e0da6ddf4af7..ef1074e94b21 100644
--- samples/CMakeLists.txt
+++ samples/CMakeLists.txt
@@ -32,6 +32,11 @@ include_directories(${OPAE_INCLUDE_DIR}
${OPAE_SDK_SOURCE}/libopae/src )
include_directories(base/sw)
+if (OPAE_OBS_BUILD)
+ add_definitions("-DSPDLOG_FMT_EXTERNAL")
+ link_libraries(fmt)
+endif()
+
if(BUILD_ASE_SAMPLES)
find_package(Quartus)
find_package(Questa)
