salimma pushed to msgpack (epel9). "Add -std=gnu++11 flag"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-03-31 20:40:08 UTC
From 7a94731416fa33990008161ac87aaf34721aab35 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter(a)fedoraproject.org>
Date: Aug 04 2020 14:10:09 +0000
Subject: Add -std=gnu++11 flag
---
diff --git a/msgpack.spec b/msgpack.spec
index 9716333..522ccad 100644
--- a/msgpack.spec
+++ b/msgpack.spec
@@ -40,7 +40,7 @@ if test ! -e "obj"; then
mkdir obj
fi
pushd obj
-
+export CXXFLAGS="%{build_cxxflags} -std=gnu++11"
%cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} -Dlibdir=%{_libdir} -DBUILD_SHARED_LIBS=ON
%make_build
@@ -64,7 +64,6 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C obj
%files
-%{!?_licensedir:%global license %doc}
%license LICENSE_1_0.txt COPYING
%doc AUTHORS ChangeLog NOTICE README README.md
%{_libdir}/*.so.*
https://src.fedoraproject.org/rpms/msgpack/c/7a94731416fa33990008161ac87a...
2Â years, 1Â month
salimma pushed to msgpack (epel9). "Backport an upstream fix for test
failures on s390x"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-03-31 20:40:08 UTC
From 2a0430a4a97bccc3d4ea8b38044fe177b823b471 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno(a)redhat.com>
Date: Aug 27 2018 15:28:39 +0000
Subject: Backport an upstream fix for test failures on s390x
---
diff --git a/0001-Fixed-724.patch b/0001-Fixed-724.patch
new file mode 100644
index 0000000..16bebe1
--- /dev/null
+++ b/0001-Fixed-724.patch
@@ -0,0 +1,61 @@
+From 53d2ea9ad3cc20e1beac2e1c014082c25e221182 Mon Sep 17 00:00:00 2001
+From: Takatoshi Kondo <redboltz(a)gmail.com>
+Date: Sun, 26 Aug 2018 10:58:47 +0900
+Subject: [PATCH] Fixed #724.
+
+Fixed type mismatch in msgpack_timestamp.
+Added 64bit singed postfix.
+---
+ include/msgpack/timestamp.h | 8 ++++++--
+ include/msgpack/v1/adaptor/cpp11/chrono.hpp | 4 ++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/include/msgpack/timestamp.h b/include/msgpack/timestamp.h
+index 4d7df83d..76139312 100644
+--- a/include/msgpack/timestamp.h
++++ b/include/msgpack/timestamp.h
+@@ -28,13 +28,17 @@ static inline bool msgpack_object_to_timestamp(const msgpack_object* obj, msgpac
+ switch (obj->via.ext.size) {
+ case 4:
+ ts->tv_nsec = 0;
+- _msgpack_load32(uint32_t, obj->via.ext.ptr, &ts->tv_sec);
++ {
++ uint32_t v;
++ _msgpack_load32(uint32_t, obj->via.ext.ptr, &v);
++ ts->tv_sec = v;
++ }
+ return true;
+ case 8: {
+ uint64_t value;
+ _msgpack_load64(uint64_t, obj->via.ext.ptr, &value);
+ ts->tv_nsec = (uint32_t)(value >> 34);
+- ts->tv_sec = value & 0x00000003ffffffffL;
++ ts->tv_sec = value & 0x00000003ffffffffLL;
+ return true;
+ }
+ case 12:
+diff --git a/include/msgpack/v1/adaptor/cpp11/chrono.hpp b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
+index 1e08355e..db2035b7 100644
+--- a/include/msgpack/v1/adaptor/cpp11/chrono.hpp
++++ b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
+@@ -41,7 +41,7 @@ struct as<std::chrono::system_clock::time_point> {
+ uint64_t value;
+ _msgpack_load64(uint64_t, o.via.ext.data(), &value);
+ uint32_t nanosec = static_cast<uint32_t>(value >> 34);
+- uint64_t sec = value & 0x00000003ffffffffL;
++ uint64_t sec = value & 0x00000003ffffffffLL;
+ tp += std::chrono::duration_cast<std::chrono::system_clock::duration>(
+ std::chrono::nanoseconds(nanosec));
+ tp += std::chrono::seconds(sec);
+@@ -79,7 +79,7 @@ struct convert<std::chrono::system_clock::time_point> {
+ uint64_t value;
+ _msgpack_load64(uint64_t, o.via.ext.data(), &value);
+ uint32_t nanosec = static_cast<uint32_t>(value >> 34);
+- uint64_t sec = value & 0x00000003ffffffffL;
++ uint64_t sec = value & 0x00000003ffffffffLL;
+ tp += std::chrono::duration_cast<std::chrono::system_clock::duration>(
+ std::chrono::nanoseconds(nanosec));
+ tp += std::chrono::seconds(sec);
+--
+2.17.1
+
diff --git a/msgpack.spec b/msgpack.spec
index 4639434..c91487d 100644
--- a/msgpack.spec
+++ b/msgpack.spec
@@ -7,6 +7,7 @@ Group: System Environment/Libraries
License: Boost
URL: http://msgpack.org
Source0: https://github.com/msgpack/msgpack-c/releases/download/cpp-%{version}/%{n...
+Patch: 0001-Fixed-724.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -31,7 +32,7 @@ Libraries and header files for %{name}
%prep
-%setup -q
+%autosetup -p1
%build
@@ -59,8 +60,6 @@ popd
%install
make install/fast DESTDIR=$RPM_BUILD_ROOT -C obj
-rm -fv $RPM_BUILD_ROOT%{_libdir}/libmsgpackc.a
-
%ldconfig_scriptlets
https://src.fedoraproject.org/rpms/msgpack/c/2a0430a4a97bccc3d4ea8b38044f...
2Â years, 1Â month
salimma pushed to msgpack (epel9). "Update to upstream 3.1.0 release"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-03-31 20:40:08 UTC
From 2f32f48b0da52f87768bb331429d6204c5c6fcd5 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno(a)redhat.com>
Date: Aug 22 2018 15:07:02 +0000
Subject: Update to upstream 3.1.0 release
---
diff --git a/.gitignore b/.gitignore
index aaad7f6..1438a70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/msgpack-1.4.1.tar.gz
/msgpack-1.4.2.tar.gz
/msgpack-3.0.1.tar.gz
+/msgpack-3.1.0.tar.gz
diff --git a/msgpack.spec b/msgpack.spec
index 98b0929..4639434 100644
--- a/msgpack.spec
+++ b/msgpack.spec
@@ -1,6 +1,6 @@
Name: msgpack
-Version: 3.0.1
-Release: 2%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
Summary: Binary-based efficient object serialization library
Group: System Environment/Libraries
@@ -40,7 +40,7 @@ if test ! -e "obj"; then
fi
pushd obj
-%cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} -Dlibdir=%{_libdir}
+%cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} -Dlibdir=%{_libdir} -DBUILD_SHARED_LIBS=ON
%make_build
popd
@@ -78,6 +78,10 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/libmsgpackc.a
%changelog
+* Wed Aug 22 2018 Daiki Ueno <dueno(a)redhat.com> - 3.1.0-1
+- new upstream release
+- cmake configuration files no longer rely on nonexistent static libraries
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 870d4c3..40905e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (msgpack-3.0.1.tar.gz) = b1ddf135ba83cb4167edf638cc3dd0ea392136dc9ad52cd99fc9db4d0a26fb283105d585323facae55ce3c55a4870ae5e7a52194ea9535139e217f4febe11128
+SHA512 (msgpack-3.1.0.tar.gz) = 48182e1bfbfe46f3f2446a36f044bc0404d96abf180bf32974e0c459e3136bfb08ee3d03d31f592ae0c15bd12819b91e87030f5cdc7775f8deb8db474a198acf
https://src.fedoraproject.org/rpms/msgpack/c/2f32f48b0da52f87768bb331429d...
2Â years, 1Â month