Skip to content

Comments

tbb: 2020.3 -> 2021.7.0#195401

Closed
erictapen wants to merge 1 commit intoNixOS:stagingfrom
erictapen:tbb
Closed

tbb: 2020.3 -> 2021.7.0#195401
erictapen wants to merge 1 commit intoNixOS:stagingfrom
erictapen:tbb

Conversation

@erictapen
Copy link
Member

@erictapen erictapen commented Oct 10, 2022

Description of changes

It builds for x86_64-linux, but there is still an error for Musl:

In file included from /tmp/nix-build-tbb-2021.7.0.drv-0/source/test/common/test.h:32,
                 from /tmp/nix-build-tbb-2021.7.0.drv-0/source/test/tbbmalloc/test_malloc_overload.cpp:45:
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/tbbmalloc/test_malloc_overload.cpp: In function ‘void DOCTEST_ANON_FUNC_41()’:
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/tbbmalloc/test_malloc_overload.cpp:400:13: error: ‘mallopt’ was not declared in this scope; did you mean ‘malloc’?
  400 |     REQUIRE(mallopt(0, 0)); // add dummy mallopt call for coverage
      |             ^~~~~~~
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/common/doctest.h:1997:9: note: in definition of macro ‘DOCTEST_WRAP_IN_TRY’
 1997 |         x;                                                                                         \
      |         ^
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/common/doctest.h:2249:9: note: in expansion of macro ‘DOCTEST_ASSERT_IMPLEMENT_2’
 2249 |         DOCTEST_ASSERT_IMPLEMENT_2(assert_type, __VA_ARGS__);                                      \
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/common/doctest.h:2268:30: note: in expansion of macro ‘DOCTEST_ASSERT_IMPLEMENT_1’
 2268 | #define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE, __VA_ARGS__)
      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/common/doctest.h:2743:22: note: in expansion of macro ‘DOCTEST_REQUIRE’
 2743 | #define REQUIRE(...) DOCTEST_REQUIRE(__VA_ARGS__)
      |                      ^~~~~~~~~~~~~~~
/tmp/nix-build-tbb-2021.7.0.drv-0/source/test/tbbmalloc/test_malloc_overload.cpp:400:5: note: in expansion of macro ‘REQUIRE’
  400 |     REQUIRE(mallopt(0, 0)); // add dummy mallopt call for coverage
      |     ^~~~~~~
compilation terminated due to -Wfatal-errors.
make[2]: *** [test/CMakeFiles/test_malloc_overload.dir/build.make:76: test/CMakeFiles/test_malloc_overload.dir/tbbmalloc/test_malloc_overload.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:4110: test/CMakeFiles/test_malloc_overload.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

Also I didn't test this on any other platform.

Changelogs:
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Member

jtojnar commented Oct 10, 2022 •
edited
Loading

See also #109113, there has been a lot of breakage in Nixpkgs and also https://github.com/lopsided98/nix-ros-overlay (e.g. gazebosim/gazebo-classic#2867).

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Oct 10, 2022
@chuangzhu
Copy link
Contributor

chuangzhu commented Oct 11, 2022

there has been a lot of breakage in Nixpkgs

How about packaging multiple versions like tbb_2020 and tbb_2021?

@azahi azahi mentioned this pull request Oct 15, 2022
Merged
13 tasks
SuperSandro2000
SuperSandro2000 reviewed Nov 8, 2022
View reviewed changes
pkgs/development/libraries/tbb/default.nix
Comment on lines +20 to 21
nativeBuildInputs = [ cmake pkg-config ] ++ (lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
nativeBuildInputs = [ cmake pkg-config ] ++ (lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
nativeBuildInputs = [ cmake pkg-config ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

Copy link
Member

@jtojnar jtojnar Nov 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always using optionals and multi-line dependencies makes it less error-prone and more git diff and blame friendly.

pkgs/development/libraries/tbb/default.nix
makeFlags = lib.optionals stdenv.cc.isClang [
"compiler=clang"
];
]);
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
]);

@LeSuisse LeSuisse added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 28, 2023
@jtojnar jtojnar mentioned this pull request Feb 6, 2023
Closed
13 tasks
@NickCao
Copy link
Member

NickCao commented Apr 24, 2023

Superseded by #217585

@NickCao NickCao closed this Apr 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@erictapen @jtojnar @chuangzhu @NickCao @SuperSandro2000 @LeSuisse