Skip to content
Snippets Groups Projects

Fix build on FreeBSD - Refactor spawn_make_environment_for_display()

Merged Guido Falsi requested to merge (removed):FreeBSD_Build_Fix into master
All threads resolved!

On FreeBSD environ needs to be defined in the same source file where it is used.

Linux provides a nonstandard extention to avoid needing the definition.

This patch adds back code which was removed in commit 447b3194 but with #ifdef FreeBSD since it is needed only there.

Ref: https://man7.org/linux/man-pages/man7/environ.7.html https://man.freebsd.org/cgi/man.cgi?query=environ&apropos=0&sektion=0&manpath=FreeBSD+13.1-RELEASE+and+Ports&arch=default&format=html

Merge request reports

Merged by Gaël BonithonGaël Bonithon 1 year ago (Mar 19, 2023 9:31am UTC)

Merge details

  • Changes merged into with f02b83d2.
  • Deleted the source branch.

Pipeline #21681 passed

Pipeline passed for f02b83d2 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Oh please also respect the 72 character limit for the commit message lines. Thanks!

  • Guido Falsi resolved all threads

    resolved all threads

  • Guido Falsi added 1 commit

    added 1 commit

    Compare with previous version

  • Guido Falsi added 1 commit

    added 1 commit

    • f02b83d2 - Refactor spawn_make_environment_for_display()

    Compare with previous version

  • Guido Falsi resolved all threads

    resolved all threads

  • fwiw, madpilot/FreeBSD_Build_Fix builds fine on OpenBSD, and same thing when backported on top of 4.18.0. thanks !

  • merged

  • Gaël Bonithon changed milestone to %4.18.1

    changed milestone to %4.18.1

  • Guido Falsi resolved all threads

    resolved all threads

  • Please register or sign in to reply
    Loading