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.

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

Disable build flag for openssl102 nix aarch64-linux #4045

Merged
merged 6 commits into from
Jun 21, 2023
Merged

Disable build flag for openssl102 nix aarch64-linux #4045

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb8774d
Drop the -d build flag for openssl102 on nix aarch64-linux
dougch Jun 7, 2023
cf30282
add openssl102 nix compiler flags for darwin
dougch Jun 7, 2023
61a48ed
Merge branch 'main' into devShell_openssl102arm
dougch Jun 16, 2023
6b07252
PR feedback
dougch Jun 19, 2023
b533273
Merge branch 'main' into devShell_openssl102arm
dougch Jun 20, 2023
555a474
Merge branch 'main' into devShell_openssl102arm
dougch Jun 21, 2023
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
25 changes: 22 additions & 3 deletions nix/openssl_1_0_2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,28 @@ pkgs.stdenv.mkDerivation rec {

buildInputs = [ pkgs.gnumake pkgs.perl534 ];

configurePhase = ''
./config -d shared -g3 -fPIC no-libunbound no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-ssl-trace no-store no-zlib no-hw no-mdc2 no-seed no-idea enable-ec_nistp_64_gcc_128 no-camellia no-bf no-ripemd no-dsa no-ssl2 no-capieng -DSSL_FORBID_ENULL -DOPENSSL_NO_DTLS1 -DOPENSSL_NO_HEARTBEATS --prefix=$out
'';
configurePhase = let
default_options =
dougch marked this conversation as resolved.
Show resolved Hide resolved
"shared -g3 -fPIC no-libunbound no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-ssl-trace no-store no-zlib no-hw no-mdc2 no-seed no-idea enable-ec_nistp_64_gcc_128 no-camellia no-bf no-ripemd no-dsa no-ssl2 no-capieng -DSSL_FORBID_ENULL -DOPENSSL_NO_DTLS1 -DOPENSSL_NO_HEARTBEATS --prefix=$out";
in {
x86_64-linux = ''
./config -d ${default_options}
'';
# The Openssl102 Configure script appears to have a bug and won't recognize
# aarch64 as a supported platform when passed the '-d' flag.
# See the PR for more detail: https://github.com/aws/s2n-tls/pull/4045
aarch64-linux = ''
./config ${default_options}
'';
x86_64-darwin = ''
# TODO: validation in future PR - nix checks fail without a definition.
./config -d ${default_options}
'';
aarch64-darwin = ''
# TODO: validation in future PR - nix checks fail without a definition.
./config ${default_options}
'';
}.${pkgs.stdenv.hostPlatform.system};

buildPhase = ''
make depend -j $(nproc)
Expand Down