Extended Boost with the `boost_stacktrace_backtrace` library. (#4396)

SPECS/boost/boost.spec

@@ -1,14 +1,18 @@
+%define underscore_version %(echo %{version} | cut -d. -f1-3 --output-delimiter="_")
+
 Summary:        Boost
 Name:           boost
 Version:        1.76.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Boost
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          System Environment/Security
 URL:            https://www.boost.org/
-Source0:        https://downloads.sourceforge.net/boost/boost_1_76_0.tar.bz2
+Source0:        https://downloads.sourceforge.net/boost/%{name}_%{underscore_version}.tar.bz2
+
 BuildRequires:  bzip2-devel
+BuildRequires:  libbacktrace-static
 
 %description
 Boost provides a set of free peer-reviewed portable C++ source libraries. It includes libraries for
@@ -33,7 +37,7 @@ Requires:       %{name} = %{version}-%{release}
 The boost-static package contains boost static libraries.
 
 %prep
-%autosetup -n %{name}_1_76_0
+%autosetup -n %{name}_%{underscore_version}
 
 %build
 ./bootstrap.sh --prefix=%{buildroot}%{_prefix}
@@ -60,6 +64,9 @@ rm -rf %{buildroot}%{_libdir}/cmake
 %{_libdir}/libboost_*.a
 
 %changelog
+* Wed Dec 07 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.76.0-2
+- Making Boost build its static libbost_stacktrace_backtrace.a lib.
+
 * Mon Jan 03 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 1.76.0-1
 - Update version to 1.76.0
 

SPECS/gcc/gcc.spec

@@ -3,7 +3,7 @@
 Summary:        Contains the GNU compiler collection
 Name:           gcc
 Version:        11.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -94,6 +94,13 @@ This package adds C++ support to the GNU Compiler Collection.
 It includes support for most of the current C++ specification,
 including templates and exception handling.
 
+%package -n     libbacktrace-static
+Summary:        Static library for GCC's libbacktrace.
+Group:          System Environment/Libraries
+
+%description -n libbacktrace-static
+This package contains GCC's static libbacktrace library and its header.
+
 %package -n     libstdc++
 Summary:        GNU C Library
 Group:          System Environment/Libraries
@@ -164,6 +171,11 @@ ln -sv gcc %{buildroot}%{_bindir}/cc
 install -vdm 755 %{buildroot}%{_datarootdir}/gdb/auto-load%{_libdir}
 mv -v %{buildroot}%{_lib64dir}/*gdb.py %{buildroot}%{_datarootdir}/gdb/auto-load%{_libdir}
 chmod 755 %{buildroot}/%{_lib64dir}/libgcc_s.so.1
+
+# Install libbacktrace-static components
+mv %{_host}/libbacktrace/.libs/libbacktrace.a %{buildroot}%{_lib64dir}
+mv libbacktrace/backtrace.h %{buildroot}%{_includedir}
+
 rm -rf %{buildroot}%{_infodir}
 %find_lang %{name} --all-name
 
@@ -220,6 +232,11 @@ make %{?_smp_mflags} check-gcc
 %{_mandir}/man1/gfortran.1.gz
 %{_libexecdir}/gcc/%{_arch}-%{_host_vendor}-linux-gnu/%{version}/f951
 
+%files -n libbacktrace-static
+%defattr(-,root,root)
+%{_includedir}/backtrace.h
+%{_lib64dir}/libbacktrace.a
+
 %files -n libgcc
 %defattr(-,root,root)
 %{_lib64dir}/libgcc_s.so.*
@@ -268,6 +285,9 @@ make %{?_smp_mflags} check-gcc
 %{_lib64dir}/libgomp.spec
 
 %changelog
+* Thu Dec 08 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 11.2.0-3
+- Adding static components for "libbacktrace".
+
 * Tue Jan 25 2022 Thomas Crain <thcrain@microsoft.com> - 11.2.0-2
 - Add provides for libasan, liblsan, libtsan, and libubsan (and their static counterparts) to the main package
 - Remove CVE-2019-15847 nopatch file (not relevant to our version of GCC)

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -20,15 +20,15 @@ mpfr-4.1.0-1.cm2.aarch64.rpm
 mpfr-devel-4.1.0-1.cm2.aarch64.rpm
 libmetalink-0.1.3-1.cm2.aarch64.rpm
 libmpc-1.2.1-1.cm2.aarch64.rpm
-libgcc-11.2.0-2.cm2.aarch64.rpm
+libgcc-11.2.0-3.cm2.aarch64.rpm
-libgcc-atomic-11.2.0-2.cm2.aarch64.rpm
+libgcc-atomic-11.2.0-3.cm2.aarch64.rpm
-libgcc-devel-11.2.0-2.cm2.aarch64.rpm
+libgcc-devel-11.2.0-3.cm2.aarch64.rpm
-libstdc++-11.2.0-2.cm2.aarch64.rpm
+libstdc++-11.2.0-3.cm2.aarch64.rpm
-libstdc++-devel-11.2.0-2.cm2.aarch64.rpm
+libstdc++-devel-11.2.0-3.cm2.aarch64.rpm
-libgomp-11.2.0-2.cm2.aarch64.rpm
+libgomp-11.2.0-3.cm2.aarch64.rpm
-libgomp-devel-11.2.0-2.cm2.aarch64.rpm
+libgomp-devel-11.2.0-3.cm2.aarch64.rpm
-gcc-11.2.0-2.cm2.aarch64.rpm
+gcc-11.2.0-3.cm2.aarch64.rpm
-gcc-c++-11.2.0-2.cm2.aarch64.rpm
+gcc-c++-11.2.0-3.cm2.aarch64.rpm
 libpkgconf-1.8.0-2.cm2.aarch64.rpm
 pkgconf-1.8.0-2.cm2.aarch64.rpm
 pkgconf-m4-1.8.0-2.cm2.noarch.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -20,15 +20,15 @@ mpfr-4.1.0-1.cm2.x86_64.rpm
 mpfr-devel-4.1.0-1.cm2.x86_64.rpm
 libmetalink-0.1.3-1.cm2.x86_64.rpm
 libmpc-1.2.1-1.cm2.x86_64.rpm
-libgcc-11.2.0-2.cm2.x86_64.rpm
+libgcc-11.2.0-3.cm2.x86_64.rpm
-libgcc-atomic-11.2.0-2.cm2.x86_64.rpm
+libgcc-atomic-11.2.0-3.cm2.x86_64.rpm
-libgcc-devel-11.2.0-2.cm2.x86_64.rpm
+libgcc-devel-11.2.0-3.cm2.x86_64.rpm
-libstdc++-11.2.0-2.cm2.x86_64.rpm
+libstdc++-11.2.0-3.cm2.x86_64.rpm
-libstdc++-devel-11.2.0-2.cm2.x86_64.rpm
+libstdc++-devel-11.2.0-3.cm2.x86_64.rpm
-libgomp-11.2.0-2.cm2.x86_64.rpm
+libgomp-11.2.0-3.cm2.x86_64.rpm
-libgomp-devel-11.2.0-2.cm2.x86_64.rpm
+libgomp-devel-11.2.0-3.cm2.x86_64.rpm
-gcc-11.2.0-2.cm2.x86_64.rpm
+gcc-11.2.0-3.cm2.x86_64.rpm
-gcc-c++-11.2.0-2.cm2.x86_64.rpm
+gcc-c++-11.2.0-3.cm2.x86_64.rpm
 libpkgconf-1.8.0-2.cm2.x86_64.rpm
 pkgconf-1.8.0-2.cm2.x86_64.rpm
 pkgconf-m4-1.8.0-2.cm2.noarch.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -91,16 +91,16 @@ flex-debuginfo-2.6.4-7.cm2.aarch64.rpm
 flex-devel-2.6.4-7.cm2.aarch64.rpm
 gawk-5.1.0-2.cm2.aarch64.rpm
 gawk-debuginfo-5.1.0-2.cm2.aarch64.rpm
-gcc-11.2.0-2.cm2.aarch64.rpm
+gcc-11.2.0-3.cm2.aarch64.rpm
-gcc-c++-11.2.0-2.cm2.aarch64.rpm
+gcc-c++-11.2.0-3.cm2.aarch64.rpm
-gcc-debuginfo-11.2.0-2.cm2.aarch64.rpm
+gcc-debuginfo-11.2.0-3.cm2.aarch64.rpm
 gdbm-1.21-1.cm2.aarch64.rpm
 gdbm-debuginfo-1.21-1.cm2.aarch64.rpm
 gdbm-devel-1.21-1.cm2.aarch64.rpm
 gdbm-lang-1.21-1.cm2.aarch64.rpm
 gettext-0.21-2.cm2.aarch64.rpm
 gettext-debuginfo-0.21-2.cm2.aarch64.rpm
-gfortran-11.2.0-2.cm2.aarch64.rpm
+gfortran-11.2.0-3.cm2.aarch64.rpm
 glib-2.71.0-1.cm2.aarch64.rpm
 glib-debuginfo-2.71.0-1.cm2.aarch64.rpm
 glib-devel-2.71.0-1.cm2.aarch64.rpm
@@ -149,6 +149,7 @@ libarchive-devel-3.6.1-2.cm2.aarch64.rpm
 libassuan-2.5.5-2.cm2.aarch64.rpm
 libassuan-debuginfo-2.5.5-2.cm2.aarch64.rpm
 libassuan-devel-2.5.5-2.cm2.aarch64.rpm
+libbacktrace-static-11.2.0-3.cm2.aarch64.rpm
 libcap-2.60-1.cm2.aarch64.rpm
 libcap-debuginfo-2.60-1.cm2.aarch64.rpm
 libcap-devel-2.60-1.cm2.aarch64.rpm
@@ -158,14 +159,14 @@ libcap-ng-devel-0.8.2-2.cm2.aarch64.rpm
 libffi-3.4.2-2.cm2.aarch64.rpm
 libffi-debuginfo-3.4.2-2.cm2.aarch64.rpm
 libffi-devel-3.4.2-2.cm2.aarch64.rpm
-libgcc-11.2.0-2.cm2.aarch64.rpm
+libgcc-11.2.0-3.cm2.aarch64.rpm
-libgcc-atomic-11.2.0-2.cm2.aarch64.rpm
+libgcc-atomic-11.2.0-3.cm2.aarch64.rpm
-libgcc-devel-11.2.0-2.cm2.aarch64.rpm
+libgcc-devel-11.2.0-3.cm2.aarch64.rpm
 libgcrypt-1.9.4-1.cm2.aarch64.rpm
 libgcrypt-debuginfo-1.9.4-1.cm2.aarch64.rpm
 libgcrypt-devel-1.9.4-1.cm2.aarch64.rpm
-libgomp-11.2.0-2.cm2.aarch64.rpm
+libgomp-11.2.0-3.cm2.aarch64.rpm
-libgomp-devel-11.2.0-2.cm2.aarch64.rpm
+libgomp-devel-11.2.0-3.cm2.aarch64.rpm
 libgpg-error-1.43-2.cm2.aarch64.rpm
 libgpg-error-debuginfo-1.43-2.cm2.aarch64.rpm
 libgpg-error-devel-1.43-2.cm2.aarch64.rpm
@@ -200,8 +201,8 @@ libsolv-tools-0.7.20-1.cm2.aarch64.rpm
 libssh2-1.9.0-2.cm2.aarch64.rpm
 libssh2-debuginfo-1.9.0-2.cm2.aarch64.rpm
 libssh2-devel-1.9.0-2.cm2.aarch64.rpm
-libstdc++-11.2.0-2.cm2.aarch64.rpm
+libstdc++-11.2.0-3.cm2.aarch64.rpm
-libstdc++-devel-11.2.0-2.cm2.aarch64.rpm
+libstdc++-devel-11.2.0-3.cm2.aarch64.rpm
 libtasn1-4.19.0-1.cm2.aarch64.rpm
 libtasn1-debuginfo-4.19.0-1.cm2.aarch64.rpm
 libtasn1-devel-4.19.0-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -91,16 +91,16 @@ flex-debuginfo-2.6.4-7.cm2.x86_64.rpm
 flex-devel-2.6.4-7.cm2.x86_64.rpm
 gawk-5.1.0-2.cm2.x86_64.rpm
 gawk-debuginfo-5.1.0-2.cm2.x86_64.rpm
-gcc-11.2.0-2.cm2.x86_64.rpm
+gcc-11.2.0-3.cm2.x86_64.rpm
-gcc-c++-11.2.0-2.cm2.x86_64.rpm
+gcc-c++-11.2.0-3.cm2.x86_64.rpm
-gcc-debuginfo-11.2.0-2.cm2.x86_64.rpm
+gcc-debuginfo-11.2.0-3.cm2.x86_64.rpm
 gdbm-1.21-1.cm2.x86_64.rpm
 gdbm-debuginfo-1.21-1.cm2.x86_64.rpm
 gdbm-devel-1.21-1.cm2.x86_64.rpm
 gdbm-lang-1.21-1.cm2.x86_64.rpm
 gettext-0.21-2.cm2.x86_64.rpm
 gettext-debuginfo-0.21-2.cm2.x86_64.rpm
-gfortran-11.2.0-2.cm2.x86_64.rpm
+gfortran-11.2.0-3.cm2.x86_64.rpm
 glib-2.71.0-1.cm2.x86_64.rpm
 glib-debuginfo-2.71.0-1.cm2.x86_64.rpm
 glib-devel-2.71.0-1.cm2.x86_64.rpm
@@ -149,6 +149,7 @@ libarchive-devel-3.6.1-2.cm2.x86_64.rpm
 libassuan-2.5.5-2.cm2.x86_64.rpm
 libassuan-debuginfo-2.5.5-2.cm2.x86_64.rpm
 libassuan-devel-2.5.5-2.cm2.x86_64.rpm
+libbacktrace-static-11.2.0-3.cm2.x86_64.rpm
 libcap-2.60-1.cm2.x86_64.rpm
 libcap-debuginfo-2.60-1.cm2.x86_64.rpm
 libcap-devel-2.60-1.cm2.x86_64.rpm
@@ -158,14 +159,14 @@ libcap-ng-devel-0.8.2-2.cm2.x86_64.rpm
 libffi-3.4.2-2.cm2.x86_64.rpm
 libffi-debuginfo-3.4.2-2.cm2.x86_64.rpm
 libffi-devel-3.4.2-2.cm2.x86_64.rpm
-libgcc-11.2.0-2.cm2.x86_64.rpm
+libgcc-11.2.0-3.cm2.x86_64.rpm
-libgcc-atomic-11.2.0-2.cm2.x86_64.rpm
+libgcc-atomic-11.2.0-3.cm2.x86_64.rpm
-libgcc-devel-11.2.0-2.cm2.x86_64.rpm
+libgcc-devel-11.2.0-3.cm2.x86_64.rpm
 libgcrypt-1.9.4-1.cm2.x86_64.rpm
 libgcrypt-debuginfo-1.9.4-1.cm2.x86_64.rpm
 libgcrypt-devel-1.9.4-1.cm2.x86_64.rpm
-libgomp-11.2.0-2.cm2.x86_64.rpm
+libgomp-11.2.0-3.cm2.x86_64.rpm
-libgomp-devel-11.2.0-2.cm2.x86_64.rpm
+libgomp-devel-11.2.0-3.cm2.x86_64.rpm
 libgpg-error-1.43-2.cm2.x86_64.rpm
 libgpg-error-debuginfo-1.43-2.cm2.x86_64.rpm
 libgpg-error-devel-1.43-2.cm2.x86_64.rpm
@@ -200,8 +201,8 @@ libsolv-tools-0.7.20-1.cm2.x86_64.rpm
 libssh2-1.9.0-2.cm2.x86_64.rpm
 libssh2-debuginfo-1.9.0-2.cm2.x86_64.rpm
 libssh2-devel-1.9.0-2.cm2.x86_64.rpm
-libstdc++-11.2.0-2.cm2.x86_64.rpm
+libstdc++-11.2.0-3.cm2.x86_64.rpm
-libstdc++-devel-11.2.0-2.cm2.x86_64.rpm
+libstdc++-devel-11.2.0-3.cm2.x86_64.rpm
 libtasn1-4.19.0-1.cm2.x86_64.rpm
 libtasn1-debuginfo-4.19.0-1.cm2.x86_64.rpm
 libtasn1-devel-4.19.0-1.cm2.x86_64.rpm

toolkit/resources/manifests/package/update_manifests.sh

@@ -68,6 +68,7 @@ remove_packages_for_pkggen_core () {
     sed -i '/kmod/d' $TmpPkgGen
     sed -i '/krb5-[[:alpha:]]/d' $TmpPkgGen
     sed -i '/libarchive/d' $TmpPkgGen
+    sed -i '/libbacktrace-static/d' $TmpPkgGen
     sed -i '/libgpg-error-[[:alpha:]]/d' $TmpPkgGen
     sed -i '/libgcrypt-[[:alpha:]]/d' $TmpPkgGen
     sed -i '/libselinux-[[:alpha:]]/d' $TmpPkgGen