diff --git a/gperftools.spec b/gperftools.spec index b2e0b2a32603a9f9f345cfafd6e9f33ffd55fb17..7186ec2bff98c44bbcc899ad8aa6610934f9fa36 100644 --- a/gperftools.spec +++ b/gperftools.spec @@ -1,6 +1,6 @@ Name: gperftools Version: 2.9.1 -Release: 1 +Release: 2 Summary: high-performance malloc and performance analysis tools License: BSD @@ -9,10 +9,11 @@ Source0: https://github.com/gperftools/gperftools/releases/download/%{name}-%{ve patch1: gperftools-generic-dynamic-tls.patch Patch9000: issue-1122-fix-bus-error-on-aarch64.patch #https://github.com/gperftools/gperftools/issues/1309 -#Patch9001: skip-arm-in-stacktrace_unittest.patch +Patch9001: skip-arm-in-stacktrace_unittest.patch #https://github.com/gperftools/gperftools/issues/890 -Patch9001: skip-heapchecker-in-arm-arch.patch -Patch9002: avoid-exceed-int-range.patch +Patch9002: skip-heapchecker-in-arm-arch.patch +Patch9003: avoid-exceed-int-range.patch +Patch9004: skip-tcm_asserts_unittest.patch BuildRequires: autoconf automake gcc-c++ BuildRequires: libtool libunwind-devel perl-generators @@ -107,6 +108,9 @@ LD_LIBRARY_PATH=./.libs make check %{_mandir}/man1/*.1.gz %changelog +* Mon Jan 10 2021 zhangyiru - 2.9.1-2 +- skip stacktrace_unittest & tcm_asserts_unittest + * Sun Dec 5 2021 zhouwenpei - 2.9.1-1 - update to 2.9.1 diff --git a/skip-tcm_asserts_unittest.patch b/skip-tcm_asserts_unittest.patch new file mode 100644 index 0000000000000000000000000000000000000000..31f877f6c2ac5cd3e2ed7e1aed8b3b41382f5d87 --- /dev/null +++ b/skip-tcm_asserts_unittest.patch @@ -0,0 +1,48 @@ +From f0daf93e682a07f29197a62da1ea72bf170ca3a8 Mon Sep 17 00:00:00 2001 +From: zhangyiru330 +Date: Tue, 11 Jan 2022 11:00:12 +0800 +Subject: [PATCH] skip tcm_asserts_unittest + +skip this testcase temporarily to ensure 22.03 build. +--- + Makefile.am | 2 ++ + configure.ac | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index bc61f62..0862487 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1015,6 +1015,7 @@ tcmalloc_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS) + # first linkline to make sure our malloc 'wins'. + tcmalloc_unittest_LDADD = $(LIBTCMALLOC) liblogging.la $(PTHREAD_LIBS) + ++if X86_64 + TESTS += tcm_asserts_unittest + tcm_asserts_unittest_INCLUDES = src/config_for_unittests.h \ + src/gperftools/malloc_extension.h +@@ -1025,6 +1026,7 @@ tcm_asserts_unittest_SOURCES = src/tests/tcmalloc_unittest.cc \ + tcm_asserts_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS) + tcm_asserts_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS) + tcm_asserts_unittest_LDADD = libtcmalloc_with_asserts.la liblogging.la $(PTHREAD_LIBS) ++endif X86_64 + + # This makes sure it's safe to link in both tcmalloc and + # tcmalloc_minimal. (One would never do this on purpose, but perhaps +diff --git a/configure.ac b/configure.ac +index c419d5f..7b57eb5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -306,6 +306,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __i386__ == 1 ? 0 : 1])], + [is_i386=yes], [is_i386=no]) + AM_CONDITIONAL(I386, test "$is_i386" = yes) + ++# add x86_64 architecture to skip tcm_asserts_unittest ++AM_CONDITIONAL(X86_64, test `uname -m` = "x86_64") ++ + # See if the compiler supports -Wno-unused-result. + # Newer ubuntu's turn on -D_FORTIFY_SOURCE=2, enabling + # __attribute__((warn_unused_result)) for things like write(), +-- +1.8.3.1 +