From 6b4d47f4019f87be37418df1856c0ede12ec0c8e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Jun 2020 11:09:37 +0200 Subject: update to 0.10.0 soname bump to 6 add option to not install static libraries from https://github.com/HdrHistogram/HdrHistogram_c/pull/84 add hdr_histogram_perf command --- HdrHistogram_c-static.patch | 56 +++ compat_reports/0.9.13_to_0.10.0/compat_report.html | 546 +++++++++++++++++++++ hdrhistogram.spec | 42 +- libhdr_histogram.xml | 2 +- 4 files changed, 636 insertions(+), 10 deletions(-) create mode 100644 HdrHistogram_c-static.patch create mode 100644 compat_reports/0.9.13_to_0.10.0/compat_report.html diff --git a/HdrHistogram_c-static.patch b/HdrHistogram_c-static.patch new file mode 100644 index 0000000..de85b37 --- /dev/null +++ b/HdrHistogram_c-static.patch @@ -0,0 +1,56 @@ +From d74a6abee509010a17c4a2c18e9d29acd3bad5d4 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 15 Jun 2020 10:50:12 +0200 +Subject: [PATCH] add options to be able to not install libraries + +--- + src/CMakeLists.txt | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a30f8fc..60be048 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -28,7 +28,7 @@ set(HDR_HISTOGRAM_PUBLIC_HEADERS + hdr_time.h + hdr_writer_reader_phaser.h) + +-function(hdr_histogram_add_library NAME LIBRARY_TYPE) ++function(hdr_histogram_add_library NAME LIBRARY_TYPE DO_INSTALL) + add_library(${NAME} ${LIBRARY_TYPE} + ${HDR_HISTOGRAM_SOURCES} + ${HDR_HISTOGRAM_PRIVATE_HEADERS} +@@ -44,23 +44,27 @@ function(hdr_histogram_add_library NAME LIBRARY_TYPE) + PUBLIC + $ + $) +- install( +- TARGETS ${NAME} +- EXPORT ${PROJECT_NAME}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(DO_INSTALL) ++ install( ++ TARGETS ${NAME} ++ EXPORT ${PROJECT_NAME}-targets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif() + endfunction() + + option(HDR_HISTOGRAM_BUILD_SHARED "Build shared library" ON) ++option(HDR_HISTOGRAM_BUILD_SHARED "Install shared library" ON) + if(HDR_HISTOGRAM_BUILD_SHARED) +- hdr_histogram_add_library(hdr_histogram SHARED) ++ hdr_histogram_add_library(hdr_histogram SHARED ${HDR_HISTOGRAM_BUILD_SHARED}) + set_target_properties(hdr_histogram PROPERTIES + VERSION ${HDR_VERSION} + SOVERSION ${HDR_SOVERSION}) + endif() + + option(HDR_HISTOGRAM_BUILD_STATIC "Build static library" ON) ++option(HDR_HISTOGRAM_INSTALL_STATIC "Install static library" ON) + if(HDR_HISTOGRAM_BUILD_STATIC) +- hdr_histogram_add_library(hdr_histogram_static STATIC) ++ hdr_histogram_add_library(hdr_histogram_static STATIC ${HDR_HISTOGRAM_INSTALL_STATIC}) + endif() + + install( diff --git a/compat_reports/0.9.13_to_0.10.0/compat_report.html b/compat_reports/0.9.13_to_0.10.0/compat_report.html new file mode 100644 index 0000000..844bb15 --- /dev/null +++ b/compat_reports/0.9.13_to_0.10.0/compat_report.html @@ -0,0 +1,546 @@ + + + + + + + + + +libhdr_histogram: 0.9.13 to 0.10.0 compatibility report + + + +

API compatibility report for the libhdr_histogram library between 0.9.13 and 0.10.0 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibhdr_histogram
Version #10.9.13
Version #20.10.0
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files6
Total Libraries1
Total Symbols / Types79 / 33
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-2
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
Other Changes
in Constants		-1
+ +

Added Symbols  2 

+hdr_histogram_log.h, libhdr_histogram.so.6.1.0
+hdr_log_read_entry ( struct hdr_log_reader* reader, FILE* file, struct hdr_log_entry* entry, struct hdr_histogram** histogram )
+hdr_log_write_entry ( struct hdr_log_writer* writer, FILE* file, struct hdr_log_entry* entry, struct hdr_histogram* histogram )
+
+to the top
+ +

Other Changes in Constants  1 

+hdr_histogram_log.h
+ +[+] HDR_LOG_TAG_MAX_BUFFER_LEN +
+ + +
+to the top
+

Header Files  6 

+
+hdr_histogram.h
+hdr_histogram_log.h
+hdr_interval_recorder.h
+hdr_thread.h
+hdr_time.h
+hdr_writer_reader_phaser.h
+
+
to the top
+

Libraries  1 

+
+libhdr_histogram.so.5.0.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibhdr_histogram
Version #10.9.13
Version #20.10.0
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files6
Total Libraries1
Total Symbols / Types79 / 33
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-2
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
Other Changes
in Constants		-1
+ +

Added Symbols  2 

+hdr_histogram_log.h
+hdr_log_read_entry ( struct hdr_log_reader* reader, FILE* file, struct hdr_log_entry* entry, struct hdr_histogram** histogram )
+hdr_log_write_entry ( struct hdr_log_writer* writer, FILE* file, struct hdr_log_entry* entry, struct hdr_histogram* histogram )
+
+to the top
+ +

Other Changes in Constants  1 

+hdr_histogram_log.h
+ +[+] HDR_LOG_TAG_MAX_BUFFER_LEN +
+ + +
+to the top
+

Header Files  6 

+
+hdr_histogram.h
+hdr_histogram_log.h
+hdr_interval_recorder.h
+hdr_thread.h
+hdr_time.h
+hdr_writer_reader_phaser.h
+
+
to the top
+

Libraries  1 

+
+libhdr_histogram.so.5.0.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/hdrhistogram.spec b/hdrhistogram.spec index 6c25771..881011e 100644 --- a/hdrhistogram.spec +++ b/hdrhistogram.spec @@ -7,25 +7,32 @@ # Please, preserve the changelog entries # -%global gh_commit 933c5dc1f347358450c4cd678132dd93e6ac2134 +%global gh_commit f400fa0de945d458dc83201bf5a369db5220899e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner HdrHistogram %global gh_project HdrHistogram_c %global libname libhdr_histogram -%global soname 5 +%global soname 6 Name: hdrhistogram Summary: A High Dynamic Range (HDR) Histogram -Version: 0.9.13 +Version: 0.10.0 Release: 1%{?dist} License: CC0 or BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Patch0: %{gh_project}-static.patch + +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +BuildRequires: cmake3 >= 3.5 +BuildRequires: devtoolset-6-toolchain +%else +BuildRequires: cmake >= 3.5 BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cmake > 2.8 +%endif BuildRequires: zlib-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -62,24 +69,32 @@ This package contains the %{libname} library. %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .pr84 mkdir docs cp -pr examples docs/examples -grep CMAKE_C_FLAGS CMakeLists.txt - %build -export CFLAGS="%{optflags} -Wno-unknown-pragmas -std=gnu99" +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +source /opt/rh/devtoolset-6/enable -%cmake . +%cmake3 \ +%else +%cmake \ +%endif + -DHDR_HISTOGRAM_INSTALL_STATIC=OFF \ + . make %{_smp_mflags} %install +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +source /opt/rh/devtoolset-6/enable +%endif + make install DESTDIR="%{buildroot}" -rm %{buildroot}/%{_libdir}/%{libname}_static.a rm %{buildroot}/%{_bindir}/*test @@ -98,6 +113,7 @@ make test %doc *.md %{_bindir}/hiccup %{_bindir}/hdr_decoder +%{_bindir}/hdr_histogram_perf %files libs %{!?_licensedir:%global license %%doc} @@ -109,10 +125,18 @@ make test %doc *.md %doc docs/examples %{_libdir}/%{libname}.so +%{_libdir}/cmake/hdr_histogram %{_includedir}/hdr %changelog +* Mon Jun 15 2020 Remi Collet - 0.10.0-1 +- update to 0.10.0 +- soname bump to 6 +- add option to not install static libraries from + https://github.com/HdrHistogram/HdrHistogram_c/pull/84 +- add hdr_histogram_perf command + * Tue Feb 18 2020 Remi Collet - 0.9.13-1 - update to 0.9.13 - soname bump to 5 diff --git a/libhdr_histogram.xml b/libhdr_histogram.xml index 747c7ec..b722015 100644 --- a/libhdr_histogram.xml +++ b/libhdr_histogram.xml @@ -9,7 +9,7 @@ -0.9.13 +0.10.0 -- cgit