Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coreutils: remove conflicting _FORTIFY_SOURCE definition #29554

Merged
merged 1 commit into from Sep 19, 2017

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Sep 19, 2017

Originally this was introduced in 055e646 ('coreutils: Guard against compiler not supporting __builtin_stpncpy_chk') four years ago. Right now this doesn't seem to serve any purpose and it conflicts with the hardening flags:

<command line>:2:9: warning: '_FORTIFY_SOURCE' macro redefined [-Wmacro-redefined]
#define _FORTIFY_SOURCE 2
        ^
<command line>:1:9: note: previous definition is here
#define _FORTIFY_SOURCE 0
        ^
1 warning generated.
Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • macOS
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@veprbl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Ericson2314, @DavidEGrayson and @edolstra to be potential reviewers.

@Mic92
Copy link
Member

Mic92 commented Sep 19, 2017

Can you target this pull request against the staging branch (since it is a mass-rebuild)?

Originally this was introduced in 055e646 ('coreutils: Guard against compiler not supporting __builtin_stpncpy_chk') four years ago. Right now this doesn't seem to serve any purpose and it conflicts with the hardening flags:

    <command line>:2:9: warning: '_FORTIFY_SOURCE' macro redefined [-Wmacro-redefined]
    #define _FORTIFY_SOURCE 2
            ^
    <command line>:1:9: note: previous definition is here
    #define _FORTIFY_SOURCE 0
            ^
    1 warning generated.
@veprbl veprbl requested a review from FRidh as a code owner September 19, 2017 08:59
@veprbl veprbl changed the base branch from master to staging September 19, 2017 09:00
@FRidh FRidh removed their request for review September 19, 2017 09:02
@edolstra edolstra merged commit 52d1f68 into NixOS:staging Sep 19, 2017
@veprbl veprbl deleted the patch-1 branch December 1, 2020 17:05
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.

None yet

4 participants