Skip to content

Commit a0872be

Browse files
author
Release Manager
committed
gh-36671: build/pkgs/openblas: Stop openblas from using explicit `make -j N`; but use `make -j 1` on `ubuntu-trusty` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> OpenMathLib/OpenBLAS#828 <!-- Why is this change required? What problem does it solve? --> Fixes part of #34899 (comment) Tests at https://github.com/mkoeppe/sage/actions/runs/6779033300: openblas finishes successfully in https://github.com/mkoeppe/sage/action s/runs/6779033300/job/18425453802#step:11:3863 <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] 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 - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36671 Reported by: Matthias Köppe Reviewer(s): John H. Palmieri, Matthias Köppe
2 parents 405e166 + 6d1a957 commit a0872be

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

build/pkgs/openblas/spkg-install.in

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,18 @@ fi
3434

3535
echo "Building OpenBLAS: $MAKE $OPENBLAS_CONFIGURE"
3636

37+
if $MAKE --version | grep -q -F '3.81'; then
38+
# Work around https://savannah.gnu.org/bugs/?15919
39+
OPENBLAS_CONFIGURE+=" MAKE_NB_JOBS=1"
40+
else
41+
# Do not emit "-j" options; use jobserver
42+
OPENBLAS_CONFIGURE+=" MAKE_NB_JOBS=0"
43+
fi
44+
3745
# Ensure USE_TLS=1 ; see https://github.com/sagemath/sage/issues/27256
3846
OPENBLAS_CONFIGURE="$OPENBLAS_CONFIGURE USE_TLS=1"
3947

40-
if ! (sdh_make libs netlib shared $OPENBLAS_CONFIGURE); then
48+
if ! (sdh_make libs $OPENBLAS_CONFIGURE && sdh_make netlib $OPENBLAS_CONFIGURE && sdh_make shared $OPENBLAS_CONFIGURE); then
4149
if [[ $OPENBLAS_CONFIGURE == *"TARGET"* ]]; then
4250
sdh_die "Error building OpenBLAS"
4351
else
@@ -47,7 +55,7 @@ if ! (sdh_make libs netlib shared $OPENBLAS_CONFIGURE); then
4755
echo "Error building OpenBLAS"
4856
echo "Retrying building OpenBLAS: $MAKE $OPENBLAS_CONFIGURE"
4957
sdh_make clean
50-
sdh_make libs netlib shared $OPENBLAS_CONFIGURE
58+
sdh_make libs $OPENBLAS_CONFIGURE && sdh_make netlib $OPENBLAS_CONFIGURE && sdh_make shared $OPENBLAS_CONFIGURE
5159
fi
5260
fi
5361

0 commit comments

Comments
 (0)