Compare commits

..

No commits in common. "main" and "2.10-1mamba" have entirely different histories.

2 changed files with 12 additions and 85 deletions

View File

@ -1,56 +0,0 @@
From 36fa5ee9ef55103d9edc0a206270f487f2539465 Mon Sep 17 00:00:00 2001
From: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Date: Mon, 6 Nov 2023 13:19:17 -0500
Subject: [PATCH] patch libtool.m4 for compiler_lib_search_path fix for qnx
Amend github issue #1429
---
autogen.sh | 4 ++++
m4/libtool.patch | 26 ++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 m4/libtool.patch
diff --git a/autogen.sh b/autogen.sh
index 7c590a31e..89d8eb9c3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,7 @@
#!/bin/sh
autoreconf -i
+
+echo "patching m4/libtool.m4: See https://github.com/gperftools/gperftools/issues/1429#issuecomment-1794976863"
+
+(set -x; patch --forward -t --reject-file=- m4/libtool.m4 m4/libtool.patch && autoreconf -i)
diff --git a/m4/libtool.patch b/m4/libtool.patch
new file mode 100644
index 000000000..8318a2a9b
--- /dev/null
+++ b/m4/libtool.patch
@@ -0,0 +1,26 @@
+commit 251dfb7dd328c01f3636022b47021eaef06a6cab
+Author: Xiang.Lin <myd.xia@gmail.com>
+Date: Mon Nov 6 15:07:56 2023 +0800
+
+ libtool: fix empty "-L" in compiler_lib_search_path
+
+ If compiler place space between "-L" and the path, the path will
+ be skipped and only have empty "-L" on final compiler_lib_search_path,
+ which will cause first library in postdeps following compiler_lib_search_path
+ be skipped accidentally.
+
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index d034b12..4bd8282 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -7584,8 +7584,8 @@ if AC_TRY_EVAL(ac_compile); then
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+- if test x-L = "$p" ||
+- test x-R = "$p"; then
++ if test x-L = x"$p" ||
++ test x-R = x"$p"; then
+ prev=$p
+ continue
+ fi

View File

@ -1,5 +1,5 @@
Name: gperftools
Version: 2.16
Version: 2.10
Release: 1mamba
Summary: A collection of a high-performance multi-threaded malloc() implementation
Group: System/Tools
@ -7,15 +7,17 @@ Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/gperftools/gperftools
## GITSOURCE https://github.com/gperftools/gperftools.git gperftools-2.7
Source: https://github.com/gperftools/gperftools.git/gperftools-%{version}/gperftools-%{version}.tar.bz2
Patch0: gperftools-2.16-revert-patching-libtool-m4.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: liblzma-devel
BuildRequires: libperl
BuildRequires: libstdc++6-devel
BuildRequires: libunwind-devel
BuildRequires: libz-devel
BuildRequires: perl-devel
## AUTOBUILDREQ-END
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
@ -44,8 +46,6 @@ This package contains libraries and header files for developing applications tha
%prep
%setup -q
%patch 0 -p1 -R -b .revert-patching-libtool-m4
./autogen.sh
%build
@ -59,6 +59,8 @@ This package contains libraries and header files for developing applications tha
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%files
%defattr(-,root,root)
@ -74,13 +76,18 @@ This package contains libraries and header files for developing applications tha
%files -n lib%{name}-devel
%defattr(-,root,root)
%dir %{_includedir}/google
%{_includedir}/google/*
%dir %{_includedir}/gperftools
%{_includedir}/gperftools/*
%{_libdir}/libprofiler.a
%{_libdir}/libprofiler.la
%{_libdir}/libprofiler.so
%{_libdir}/libtcmalloc.a
%{_libdir}/libtcmalloc.la
%{_libdir}/libtcmalloc.so
%{_libdir}/libtcmalloc_*.a
%{_libdir}/libtcmalloc_*.la
%{_libdir}/libtcmalloc_*.so
%{_libdir}/pkgconfig/libprofiler.pc
%{_libdir}/pkgconfig/libtcmalloc.pc
@ -88,33 +95,9 @@ This package contains libraries and header files for developing applications tha
%dir %{_datadir}/doc/gperftools
%{_datadir}/doc/gperftools/*
%{_mandir}/man1/pprof.1*
%doc NEWS README
%doc ChangeLog ChangeLog.old NEWS README TODO
%changelog
* Wed Oct 09 2024 Automatic Build System <autodist@openmamba.org> 2.16-1mamba
- automatic version update by autodist
* Sat Jan 06 2024 Automatic Build System <autodist@openmamba.org> 2.15-1mamba
- automatic version update by autodist
* Thu Jan 04 2024 Automatic Build System <autodist@mambasoft.it> 2.14-1mamba
- automatic version update by autodist
* Wed Sep 13 2023 Automatic Build System <autodist@mambasoft.it> 2.13-1mamba
- automatic version update by autodist
* Fri Aug 25 2023 Automatic Build System <autodist@mambasoft.it> 2.12-1mamba
- automatic version update by autodist
* Tue Aug 15 2023 Automatic Build System <autodist@mambasoft.it> 2.11-1mamba
- automatic version update by autodist
* Sat Aug 05 2023 Automatic Build System <autodist@mambasoft.it> 2.10.80-1mamba
- automatic version update by autodist
* Sat Jan 14 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.10-2mamba
- rebuilt without .la files
* Wed Jun 01 2022 Automatic Build System <autodist@mambasoft.it> 2.10-1mamba
- automatic version update by autodist