$ git diff --patch-with-stat --summary 29713ee5a1106789a9d22de1064b2efb7e01d8cb..c73dc904ff83df3f781cf8a505f0f9dcc47fb506
.abf.yml | 2 +-
libatomic_ops.spec | 51 +++++++++++++++++++++++++++++----------------------
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index a44d1fd..2a1f244 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- libatomic_ops-7.6.14.tar.gz: 6385dc214e48f70a501c334d4143ead98b171f31
+ libatomic_ops-7.8.0.tar.gz: 69223bbec025a0d57977feb861479f78a5e6c8d7
diff --git a/libatomic_ops.spec b/libatomic_ops.spec
index 6da6053..cbc1c45 100644
--- a/libatomic_ops.spec
+++ b/libatomic_ops.spec
@@ -6,7 +6,6 @@
%endif
%define _disable_ld_no_undefined 1
-#define debug_package %nil
%define sname atomic_ops
%define major 1
@@ -19,12 +18,17 @@
Summary: Multiplatform atomic memory operation library
Name: libatomic_ops
-Version: 7.6.14
-Release: 1
+Version: 7.8.0
+Release: 2
License: GPLv2
Group: System/Libraries
-Url: http://www.hboehm.info/gc/
+Url: https://github.com/ivmai/libatomic_ops
Source0: https://github.com/ivmai/libatomic_ops/releases/download/v%{version}/%{name}-%{version}.tar.gz
+BuildRequires: cmake
+BuildRequires: ninja
+%if %{with compat32}
+BuildRequires: libc6
+%endif
%description
Multiplatform atomic memory operation library.
@@ -58,7 +62,7 @@ across a variety of architectures.
It should be useful both for high performance multi-threaded code which can't
afford to use the standard locking primitives, or for code that has to access
-shared data structures from signal handlers. For details, see README.txt in
+shared data structures from signal handlers. For details, see README.md in
the distribution.
%if %{with compat32}
@@ -93,37 +97,36 @@ across a variety of architectures.
It should be useful both for high performance multi-threaded code which can't
afford to use the standard locking primitives, or for code that has to access
-shared data structures from signal handlers. For details, see README.txt in
+shared data structures from signal handlers. For details, see README.md in
the distribution.
%endif
%prep
%autosetup -p1
-export CONFIGURE_TOP="$(pwd)"
-autoreconf -fi
+%build
%if %{with compat32}
-mkdir build32
-cd build32
-%configure32 --enable-shared
+%cmake32 \
+ -DBUILD_SHARED_LIBS=ON \
+ -Denable_atomic_intrinsics=OFF \
+ -G Ninja
+
+%ninja_build
cd ..
%endif
-mkdir build
-cd build
-%configure --enable-shared
+%cmake \
+ -DBUILD_SHARED_LIBS=ON \
+ -Denable_atomic_intrinsics=OFF \
+ -G Ninja
-%build
-%if %{with compat32}
-%make_build -C build32
-%endif
-%make_build -C build
+%ninja_build
%install
%if %{with compat32}
-%make_install -C build32
+%ninja_install -C build32
%endif
-%make_install -C build
+%ninja_install -C build
rm -rf %{buildroot}%{_docdir}/%{name}
@@ -134,7 +137,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}
%{_libdir}/libatomic_ops_gpl.so.%{major}*
%files -n %{devname}
-%doc COPYING README.md
+%doc COPYING LICENSE README.md
%{_includedir}/*.h
%dir %{_includedir}/%{sname}
%{_includedir}/%{sname}/*.h
@@ -158,6 +161,8 @@ rm -rf %{buildroot}%{_docdir}/%{name}
%{_includedir}/%{sname}/sysdeps/loadstore/*.h
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
+%dir %{_libdir}/cmake/%{sname}
+%{_libdir}/cmake/%{sname}/*.cmake
%if %{with compat32}
%files -n %{lib32name}
@@ -169,4 +174,6 @@ rm -rf %{buildroot}%{_docdir}/%{name}
%files -n %{dev32name}
%{_prefix}/lib/*.so
%{_prefix}/lib/pkgconfig/*
+%dir %{_prefix}/lib/cmake/%{sname}
+%{_prefix}/lib/cmake/%{sname}/*.cmake
%endif