Hello community, here is the log from the commit of package odp for openSUSE:Factory checked in at 2019-11-24 00:24:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/odp (Old) and /work/SRC/openSUSE:Factory/.odp.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "odp" Sun Nov 24 00:24:03 2019 rev:7 rq:742149 version:1.22.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/odp/odp.changes 2018-03-19 23:38:05.481974219 +0100 +++ /work/SRC/openSUSE:Factory/.odp.new.26869/odp.changes 2019-11-24 00:24:06.223188895 +0100 @@ -1,0 +2,13 @@ +Wed Oct 23 13:27:09 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Package license as %license in filelist + +------------------------------------------------------------------- +Fri Oct 11 09:59:55 UTC 2019 - Jaime Caamaño Ruiz <jcaam...@suse.com> + +- Updated to latest release 1.22 +- Removed 0001-increase_ODP_CPUMASK_SIZE.patch, no longer applies. +- Add upstream patch to fix compilation on GCC9 + * configure-suppress-pointer-to-packed-structure-warni.patch + +------------------------------------------------------------------- Old: ---- 0001-increase_ODP_CPUMASK_SIZE.patch odp-1.11.0.1_monarch.tar.gz New: ---- configure-suppress-pointer-to-packed-structure-warni.patch odp-1.22.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ odp.spec ++++++ --- /var/tmp/diff_new_pack.GtlXDO/_old 2019-11-24 00:24:06.711188945 +0100 +++ /var/tmp/diff_new_pack.GtlXDO/_new 2019-11-24 00:24:06.715188946 +0100 @@ -1,7 +1,7 @@ # # spec file for package odp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,32 +12,34 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# ODP does not promise backwards compatibility between releases, so we +# just enforce major:minor:point as version number. +%define maj 122 +%define min 0 +%define point 0 +%define lname libodp-%{maj}_%{min}_%{point} Name: odp -Version: 1.11.0.1 +Version: 1.22.0.0 Release: 0 Summary: OpenDataPlane Reference implementation License: BSD-3-Clause -Group: Development/Libraries/C and C++ -Url: https://www.opendataplane.org -Source0: https://git.linaro.org/lng/odp.git/snapshot/odp-%{version}_monarch.tar.gz -Patch0: 0001-increase_ODP_CPUMASK_SIZE.patch +URL: https://www.opendataplane.org +Source0: https://git.linaro.org/lng/odp.git/snapshot/odp-%{version}.tar.gz +Patch0: configure-suppress-pointer-to-packed-structure-warni.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen -%if %{suse_version} >= 1330 BuildRequires: gcc -%else -BuildRequires: gcc6 -%endif BuildRequires: graphviz +BuildRequires: libconfig-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(openssl) -Conflicts: otherproviders(odp-any) +Conflicts: odp-any Provides: odp-any = %{version} ExclusiveArch: aarch64 x86_64 ppc64 ppc64le @@ -45,22 +47,22 @@ The OpenDataPlane reference implementation library, development files and examples for the ThunderX platform. -%package libs +%package -n %{lname} Summary: OpenDataPlane Reference implementation -Group: System/Libraries -Conflicts: otherproviders(odp-any-libs) -Provides: odp-any-libs = %{version} +Conflicts: %{lname}-any +Provides: %{lname}-any = %{version} +Provides: odp-libs = %{version} +Obsoletes: odp-libs < 1.12 -%description libs +%description -n %{lname} Reference implementation for OpenDataPlane (ODP). The ODP project is a set of APIs for the networking data plane. %package devel Summary: Development files for the OpenDataPlane reference implementation -Group: Development/Libraries/C and C++ -Requires: %{name}-libs = %{version}-%{release} +Requires: %{lname} = %{version}-%{release} Requires: libopenssl-devel -Conflicts: otherproviders(odp-any-devel) +Conflicts: odp-any-devel Provides: odp-any-devel = %{version} %description devel @@ -68,41 +70,36 @@ reference implementation. %prep -%setup -q -n odp-1.11.0.1_monarch -# The below command is used to replace the use of git-hash with the version of the source code -sed -i "s|^AC_INIT.*|AC_INIT([OpenDataPlane], [%{version}], [lng-...@lists.linaro.org])|" configure.ac -%patch0 +%setup -q +%patch0 -p1 %build -%if %{suse_version} >= 1330 -export CFLAGS="%{optflags} -Wformat-overflow=0 -Wimplicit-fallthrough=0 -Wformat-truncation=0 -latomic" -%else export CFLAGS="%{optflags}" -%endif ./bootstrap -%configure --disable-static +%configure \ + --disable-static \ + --disable-silent-rules +make %{?_smp_mflags} %install -%if %{suse_version} >= 1330 -make V=1 DESTDIR=%{buildroot} %{?_smp_mflags} install -%else -make V=1 CC=gcc-6 DESTDIR=%{buildroot} %{?_smp_mflags} install -%endif +%make_install find %{buildroot} -type f -name 'libodp*.la' |xargs rm -f rm -f %{buildroot}%{_bindir}/odp_* +rm -rf %{buildroot}%{_sysconfdir}/odp -%files libs -%defattr(-,root,root) -%doc LICENSE README CHANGELOG +%files -n %{lname} +%license LICENSE +%doc README CHANGELOG %{_libdir}/libodp*.so.* %files devel -%defattr(-,root,root) %{_includedir}/odp* %{_libdir}/*.so %{_libdir}/pkgconfig/* -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig %changelog ++++++ configure-suppress-pointer-to-packed-structure-warni.patch ++++++ >From 8d6733aad3e23cbb3813ee7161edb7ae7f9402df Mon Sep 17 00:00:00 2001 From: Petri Savolainen <petri.savolai...@nokia.com> Date: Wed, 2 Oct 2019 10:17:24 +0300 Subject: [PATCH] configure: suppress pointer to packed structure warnings Fix GCC-9 build by handling "pointer to packed member of a struct" warnings not as errors. These warnings are generated e.g. when taking pointers to protocol header structures, which are defined with packed attribute. These structures are naturally aligned, so these warnings can be ignored. chksum.c: In function odph_process_l4_hdr: chksum.c:133:43: error: taking address of packed member of struct <anonymous> may result in an unaligned pointer value [-Werror=address-of-packed-member] pkt_chksum_ptr = (uint16_t *)(void *)&udp_hdr_ptr->chksum; ^~~~~~~~~~~~~~~~~~~~ Signed-off-by: Petri Savolainen <petri.savolai...@nokia.com> --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 857905c3..69474878 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,7 @@ AC_TYPE_UINT64_T ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror" ODP_CXXFLAGS="$ODP_CXXFLAGS -W -Wall -Werror" +# Additional warnings: ODP_CHECK_CFLAG([-Wstrict-prototypes]) ODP_CHECK_CFLAG([-Wmissing-prototypes]) ODP_CHECK_CFLAG([-Wmissing-declarations]) @@ -127,6 +128,11 @@ ODP_CHECK_CFLAG([-Wwrite-strings]) ODP_CHECK_CFLAG([-Wformat-truncation=0]) ODP_CHECK_CFLAG([-Wformat-overflow=0]) +# Suppressed warnings: +# GCC-9 warns about taking pointers to packed structure fields (e.g. protocol +# header structures). Generate only warnings on those, not errors. +ODP_CHECK_CFLAG([-Wno-error=address-of-packed-member]) + ODP_CFLAGS="$ODP_CFLAGS -std=c99" ODP_CXXFLAGS="$ODP_CXXFLAGS -std=c++11" -- 2.16.4 ++++++ odp-1.11.0.1_monarch.tar.gz -> odp-1.22.0.0.tar.gz ++++++ ++++ 220901 lines of diff (skipped)
