Skip to content

Fix the %_smp_mflags macro so it works in both TW and SLE16#1943

Merged
lslezak merged 1 commit intomasterfrom
limit_build_jobs2
Jan 24, 2025
Merged

Fix the %_smp_mflags macro so it works in both TW and SLE16#1943
lslezak merged 1 commit intomasterfrom
limit_build_jobs2

Conversation

@lslezak
Copy link
Contributor

@lslezak lslezak commented Jan 24, 2025

Problem

Details

  • I wanted to use some %if and use the new option in TW. However the macro exists in both but in SLE16 it complains about extra argument which is not accepted. And rpm evaluates macros in both %if branches... 😟
  • So I basically reverted to my original implementation

Unfortunately SLE16 uses old rpm version 4.18 which does not
support %{getncpus:proc} (added in 4.19).

We need to compute the value manually. :-/
@coveralls
Copy link

Pull Request Test Coverage Report for Build 12947234915

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 70.893%

Totals Coverage Status
Change from base Build 12946688667: 0.0%
Covered Lines: 17259
Relevant Lines: 24345

💛 - Coveralls

@lslezak lslezak merged commit eeaf9bf into master Jan 24, 2025
9 checks passed
@lslezak lslezak deleted the limit_build_jobs2 branch January 24, 2025 10:05
imobachgs added a commit that referenced this pull request Jan 24, 2025
…ation (#1945)

- Another iteration of #1939 and #1943 
- Now use an external macro instead of our implementation
- Tested in TW and SLE16 builds, works fine in both
@imobachgs imobachgs mentioned this pull request Feb 26, 2025
imobachgs added a commit that referenced this pull request Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants