build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

build(linux): explicitely set CC and CXX compilers - #4325

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker
Oct 11, 2025
Merged

build(linux): explicitely set CC and CXX compilers#4325
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
PVermeer:build_fedora_docker

Conversation

@PVermeer

@PVermeerPVermeer commented Oct 9, 2025

Copy link
Copy Markdown
Contributor

Description

This is hopefully the last PR. This fixes the fedora package build via cmake. When I build sunshine locally I could never get cuda to work so I always build it without it since I don't need it.

However I looked into the rpm spec file and transferred those changes to the linux_build.sh script and it now all seems to work.

Issues & solutions

  • wget Complained about the relative link in the -O argument when downloading cuda so I made it resolve to an an absolute path before it gets used (2beecac).
  • cmake Complained it could not find compilers so these are now explicitly set. This was already done in the copr build (0279b20).
  • cuda Could not build so I copied some config over from the rpm spec (16918a8):
    • added the --override flag conditionally
    • added CMAKE_CUDA_HOST_COMPILER flag to cmake

Every docker (including my own Fedora) is now building and packaging correctly. I don't know anything about building cuda so please look carefully.

I also want to note that it should also be possible to use the linux_build.sh script in the copr build so you don't have to maintain two separate builds. Things like cuda, the build and install could be run from the script.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

In Fedora wget complains about -O relative path
Cmake complains about not finding compilers
This is copied from the rpm spec file.

@ReenigneArcherReenigneArcher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for another PR!

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

Comment threadscripts/linux_build.sh Outdated
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

As a note: we don't use this script for Fedora or Arch internally, so it's likely those 2 will break from time to time. We used it for Fedora before we changed to the copr builds.

I know, I'm just saying you could ;). The logic in the script and the rpm spec is now basically the same.

Simplify compiler version definitions
@PVermeer

Copy link
Copy Markdown
ContributorAuthor

I've removed all the compiler version logic with alternative compilers and just set the compiler with version before cmake runs. It's much cleaner indeed.

Tested all build again, no issues found.

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Oct 10, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 11.98%. Comparing base (ed7b78f) to head (20cec98).
⚠️ Report is 79 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #4325 +/- ##
==========================================
- Coverage 12.01% 11.98% -0.03% 
==========================================
Files 87 87 Lines 17572 17572 Branches 8076 8076 ==========================================
- Hits 2111 2106 -5 - Misses 14743 14748 +5 
Partials 718 718 
FlagCoverage Δ
Linux-AppImage11.49% <ø> (ø)
Windows-AMD6413.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

@ReenigneArcher

ReenigneArcher commented Oct 10, 2025

Copy link
Copy Markdown
Member

Just one thing to fix/tweak.

This step (https://github.com/PVermeer/Sunshine/blob/699e8347da229243c190cea1fb8950a5b0f35ecd/.github/workflows/ci-linux.yml#L180) is failing because it's finding a different gcov version than what version of gcc the code was compiled with. I guess because the export variables are not getting picked up by this step.

I think to solve it we can echo the variables to the GITHUB_ENV file, like so. Then they will picked up in later steps automatically.

{
echo"CC=gcc-${gcc_version}"echo"CXX=g++-${gcc_version}"
} >>"${GITHUB_ENV}"

This assumes gcovr/gcov will use the CC/CXX variables.

@PVermeer

Copy link
Copy Markdown
ContributorAuthor

Setting the variables doesn't work.
We need to do this: https://gcovr.com/en/latest/guide/compiling.html#choosing-the-right-gcov-executable.
I've done some testing and this works:

python3 -m gcovr --gcov-executable gcov-14 . -r ../src \
--exclude-noncode-lines \
--exclude-throw-branches \
--exclude-unreachable-branches \
--verbose \
--xml-pretty \
-o coverage.xml

I've implemented your suggestion with the info above (20cec98).

@sonarqubecloud

Copy link
Copy Markdown

@ReenigneArcherReenigneArcher changed the title build(linux): sunshine now builds correctly in Fedorabuild(linux): explicitely set CC and CXX compilersOct 11, 2025
@ReenigneArcher
ReenigneArcher merged commit 246d8f1 into LizardByte:masterOct 11, 2025
48 checks passed
@PVermeer
PVermeer deleted the build_fedora_docker branch October 11, 2025 15:28
Sign up for freeto 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.

2 participants

@PVermeer@ReenigneArcher