Skip to content

Commit

Permalink
Do not replace with OpenSSL_1_1_0g w building python
Browse files Browse the repository at this point in the history
Continuation of #417.

This was attempted when the brats tests kept failing with SSL errors
for python < 3.10 ONLY on cflinuxfs3. See
https://buildpacks.ci.cf-app.com/teams/main/pipelines/python-buildpack/jobs/specs-edge-integration-develop-cflinuxfs3/builds/174

The change in #417 fixed the brats test

The original change seems to have been intended for cflinuxfs2 as
seen from this story: https://www.pivotaltracker.com/n/projects/1042066/stories/158871862
(also
cloudfoundry/binary-builder@78323c4
and
cloudfoundry/binary-builder@ccff965#diff-2183fca5c37f210ec00d4741797bd856666332eff7d11b7e10aeefb5001f40cdR12)

It looks like this replace_openssl magic also happens for nginx, but
this PR doesn't deal with that.
  • Loading branch information
arjun024 committed Nov 14, 2024
1 parent 4b005dc commit 6043da9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions tasks/build-binary-new-cflinuxfs4/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -642,12 +642,6 @@ def build_python
Runner.run("dpkg -x #{path} #{destdir}")
end

# replace openssl if needed
major, minor, _ = @source_input.version.split('.')
if @stack == 'cflinuxfs3' && major == '3' && minor.to_i < 10
DependencyBuild.replace_openssl
end

Runner.run("make")
Runner.run("make install")
# create python symlink
Expand Down
6 changes: 0 additions & 6 deletions tasks/build-binary-new/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,6 @@ def build_python(source_input, stack)
Runner.run("dpkg -x #{path} #{destdir}")
end

# replace openssl if needed
# major, minor, _ = source_input.version.split('.')
# if stack == 'cflinuxfs3' && major == '3' && minor.to_i < 10
# DependencyBuild.replace_openssl
# end

Runner.run("make")
Runner.run("make install")
# create python symlink
Expand Down

0 comments on commit 6043da9

Please sign in to comment.