Skip to content

mingw: Disalbe FORTIFY_SOURCE by default. #133479

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.

Sign up for GitHub

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

Merged
shlevy merged 2 commits into from
Aug 12, 2021
Merged

mingw: Disalbe FORTIFY_SOURCE by default. #133479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ecfbe0
mingw: Disalbe FORTIFY_SOURCE by default.
shlevy Aug 11, 2021
5f073a6
libsodium: Don't fortify on mingw
shlevy Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/build-support/cc-wrapper/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ stdenv.mkDerivation {
+ optionalString hostPlatform.isCygwin ''
hardening_unsupported_flags+=" pic"
'' + optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector"
hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic"
'' + optionalString (targetPlatform.libc == "newlib") ''
Expand Down
7 changes: 6 additions & 1 deletion pkgs/development/libraries/libsodium/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchurl, autoreconfHook }:

stdenv.mkDerivation rec {
pname = "libsodium";
Expand All @@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
};

outputs = [ "out" "dev" ];

patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch;

nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook;

separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";

enableParallelBuilding = true;
Expand Down
15 changes: 15 additions & 0 deletions pkgs/development/libraries/libsodium/mingw-no-fortify.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac
--- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400
+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400
@@ -217,11 +217,6 @@

AC_CHECK_DEFINE([__wasi__], [WASI="yes"], [])

-AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
-])
-
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
[CFLAGS="$CFLAGS -fvisibility=hidden"])