Skip to content

fix centos-7 build #985

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
samruddhikhandale merged 6 commits into from
May 30, 2024
Merged

fix centos-7 build #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea897ca
fix centos-7 build
12rambau May 29, 2024
0ecb272
Update src/python/install.sh
12rambau May 30, 2024
e41a561
Update src/python/install.sh
12rambau May 30, 2024
e81c762
Update src/python/install.sh
12rambau May 30, 2024
d536244
bump(python): 1.5.0 -> 1.5.1
12rambau May 30, 2024
ebd22f9
Merge branch 'main' into centos-7
12rambau May 30, 2024
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 src/python/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "python",
"version": "1.6.0",
"version": "1.6.1",
"name": "Python",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
"description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities. JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
Expand Down
8 changes: 4 additions & 4 deletions src/python/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ add_symlink() {
}
Comment thread
12rambau marked this conversation as resolved.

install_openssl3() {
local _prefix=$1
mkdir /tmp/openssl3
(
cd /tmp/openssl3
Expand All @@ -403,7 +402,7 @@ install_openssl3() {
curl -sSL -o "/tmp/openssl3/${tgz_filename}" "${tgz_url}"
tar xzf ${tgz_filename}
cd openssl-${openssl3_version}
./config --prefix=${_prefix} --openssldir=${_prefix} --libdir=lib
./config --libdir=lib
make -j $(nproc)
make install_dev
)
Expand Down Expand Up @@ -446,11 +445,12 @@ install_from_source() {
# Some platforms/os versions need modern versions of openssl installed
# via common package repositories, for now rhel-7 family, use case statement to
# make it easy to expand
SSL_INSTALL_PATH="/usr/local"
case ${VERSION_CODENAME} in
centos7|rhel7)
check_packages perl-IPC-Cmd
install_openssl3 ${INSTALL_PATH}
ADDL_CONFIG_ARGS="--with-openssl=${INSTALL_PATH} --with-openssl-rpath=${INSTALL_PATH}/lib"
install_openssl3
ADDL_CONFIG_ARGS="--with-openssl=${SSL_INSTALL_PATH} --with-openssl-rpath=${SSL_INSTALL_PATH}/lib"
;;
esac

Expand Down