Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
sagemathgh-35786: onetbb: Upgrade to 2021.9.0 + GCC13 patch
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes sagemath#12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

<!-- Describe your changes here in detail. -->
<!-- Why is this change required? What problem does it solve? -->
To fix build on fedora-39-minimal, archlinux-latest-{minimal,standard},
opensuse-tumbleweed-minimal - as seen in
https://github.com/scipopt/SCIP-SDP/actions/runs/5203680653
(scipopt/SCIP-SDP#6)

Tests at https://github.com/mkoeppe/SCIP-SDP/actions/runs/5298512526
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
Part of:
-  sagemath#35092

<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->
- Depends on sagemath#35785 (merged here)

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#35786
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
  • Loading branch information
Release Manager committed Oct 1, 2023
2 parents 3506a07 + d39809b commit ba826d0
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/onetbb/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=onetbb-VERSION.tar.gz
sha1=e4be99dc35948052296105d2ae7da6d34e01ba2d
md5=68e617448f71df02d8688c84d53778f6
cksum=1573392748
sha1=b991f5d882aba2182871cfe011614cc43b92aa3c
md5=ba4ecedc4949f673a34b35de738a72fc
cksum=211900655
upstream_url=https://github.com/oneapi-src/oneTBB/archive/refs/tags/vVERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/onetbb/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.7.0
2021.9.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 154cc73ca4d359621202399cc0c3c91058e56e79 Mon Sep 17 00:00:00 2001
From: Sam James <[email protected]>
Date: Wed, 22 Feb 2023 14:16:46 +0000
Subject: [PATCH] test: common: include <cstdlib> for abort() (fix build with
GCC 13) (#1031)

GCC 13 (as usual for new compiler releases) shuffles around some
internal includes and so <cstdint> etc is no longer transitively included.

See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.

Signed-off-by: Sam James <[email protected]>
---
test/common/utils_assert.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h
index 1df8ae72ac..0123ab881e 100644
--- a/test/common/utils_assert.h
+++ b/test/common/utils_assert.h
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2005-2022 Intel Corporation
+ Copyright (c) 2005-2023 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
#include "config.h"
#include "utils_report.h"

+#include <cstdlib>
+
#define REPORT_FATAL_ERROR REPORT

namespace utils {

0 comments on commit ba826d0

Please sign in to comment.