mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-01-01 14:44:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2452 from rbenv/openssl-lib64

Browse source 
Fix linking to vendored OpenSSL on 64-bit systems
This commit is contained in:
Mislav Marohnić 2024-10-17 13:41:39 +02:00 committed by GitHub
commit a2309959d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/ruby-build
View file

@ -1209,14 +1209,11 @@ build_package_openssl() {
# Tell Ruby to use this openssl for its extension. # Tell Ruby to use this openssl for its extension.
package_option ruby configure --with-openssl-dir="$OPENSSL_PREFIX_PATH" package_option ruby configure --with-openssl-dir="$OPENSSL_PREFIX_PATH"
# Make sure pkg-config finds our build first.
export PKG_CONFIG_PATH="${OPENSSL_PREFIX_PATH}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
local nokerberos local nokerberos
[[ "$1" != openssl-1.0.* ]] || nokerberos=1 [[ "$1" != openssl-1.0.* ]] || nokerberos=1
# Compile a shared lib with zlib dynamically linked. # Compile a shared lib with zlib dynamically linked.
package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-ssl3 shared ${nokerberos:+no-ssl2 no-krb5} package_option openssl configure --openssldir="$OPENSSLDIR" --libdir="lib" zlib-dynamic no-ssl3 shared ${nokerberos:+no-ssl2 no-krb5}
# Skip building OpenSSL docs, which is slow. # Skip building OpenSSL docs, which is slow.
local make_target="install_sw install_ssldirs" local make_target="install_sw install_ssldirs"
@ -1224,6 +1221,9 @@ build_package_openssl() {
OPENSSL_CONFIGURE="${OPENSSL_CONFIGURE:-./config}" MAKE_INSTALL_TARGET="$make_target" build_package_standard "$@" OPENSSL_CONFIGURE="${OPENSSL_CONFIGURE:-./config}" MAKE_INSTALL_TARGET="$make_target" build_package_standard "$@"
# Make sure pkg-config finds the new OpenSSL installation.
export PKG_CONFIG_PATH="${OPENSSL_PREFIX_PATH}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
local pem_file="$OPENSSLDIR/cert.pem" local pem_file="$OPENSSLDIR/cert.pem"
if is_mac; then if is_mac; then
# Extract root certs from the system keychain in .pem format. # Extract root certs from the system keychain in .pem format.

4
test/build.bats
View file

@ -397,8 +397,8 @@ DEF
unstub make unstub make
assert_build_log <<OUT assert_build_log <<OUT
openssl-1.1.1w: [--prefix=${INSTALL_ROOT}/openssl,--openssldir=${INSTALL_ROOT}/openssl/ssl,zlib-dynamic,no-ssl3,shared] PKG_CONFIG_PATH=${TMP}/install/openssl/lib/pkgconfig openssl-1.1.1w: [--prefix=${INSTALL_ROOT}/openssl,--openssldir=${INSTALL_ROOT}/openssl/ssl,--libdir=lib,zlib-dynamic,no-ssl3,shared]
PKG_CONFIG_PATH=${TMP}/install/openssl/lib/pkgconfig make -j 2 make -j 2
make install_sw install_ssldirs make install_sw install_ssldirs
ruby-3.2.0: [--prefix=$INSTALL_ROOT,--with-openssl-dir=$INSTALL_ROOT/openssl,--with-ext=openssl,psych,+] PKG_CONFIG_PATH=${TMP}/install/openssl/lib/pkgconfig ruby-3.2.0: [--prefix=$INSTALL_ROOT,--with-openssl-dir=$INSTALL_ROOT/openssl,--with-ext=openssl,psych,+] PKG_CONFIG_PATH=${TMP}/install/openssl/lib/pkgconfig
PKG_CONFIG_PATH=${TMP}/install/openssl/lib/pkgconfig make -j 2 PKG_CONFIG_PATH=${TMP}/install/openssl/lib/pkgconfig make -j 2