Unverified Commit fe933abb authored by Mislav Marohnić's avatar Mislav Marohnić Committed by GitHub
Browse files

Merge pull request #2271 from rbenv/ldflags-clean 

Remove implicit LDFLAGS, CPPFLAGS, and "ldflags_dirs" build step
parents aada31ae 04ba857b

bin/ruby-build

+2 −17
Original line number Diff line number Diff line
@@ -1171,21 +1171,9 @@ build_package_verify_openssl() { 
  ' "$(basename "$(type -p yum apt-get | head -1)")" >&4 2>&1

}



# Ensure that directories listed in LDFLAGS exist

# Kept for backward compatibility with 3rd-party definitions.

build_package_ldflags_dirs() {

  local ldflags

  read -d '' -r -a ldflags <<<"$LDFLAGS" || true

  local index=0

  local dir

  while [ "$index" -lt "${#ldflags[@]}" ]; do

    dir=""

    case "${ldflags[index]}" in

    -L  ) dir="${ldflags[index+1]}" ;;

    -L* ) dir="${ldflags[index]#-L}" ;;

    esac

    [ -z "$dir" ] || mkdir -p "$dir"

    index=$((index+1))

  done

  true

}



build_package_enable_shared() {
@@ -1501,9 +1489,6 @@ else 
  fi

fi



export LDFLAGS="-L${PREFIX_PATH}/lib ${LDFLAGS}"

export CPPFLAGS="-I${PREFIX_PATH}/include ${CPPFLAGS}"



unset RUBYOPT

unset RUBYLIB

script/update-cruby

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ fi 


cat > "$file" <<EOS

!TODO! copy openssl line from other release with the same major.minor version

install_package "ruby-${version}" "${url}#${sha256}" ldflags_dirs enable_shared standard verify_openssl

install_package "ruby-${version}" "${url}#${sha256}" enable_shared standard verify_openssl

EOS

share/ruby-build/2.1.0

+1 −1
Original line number Diff line number Diff line 
install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749" --if needs_yaml

install_package "openssl-1.0.2u" "https://www.openssl.org/source/openssl-1.0.2u.tar.gz#ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16" openssl --if needs_openssl_096_102

install_package "ruby-2.1.0" "https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.0.tar.bz2#1d3f4ad5f619ec15229206b6667586dcec7cc986672c8fbb8558161ecf07e277" warn_eol ldflags_dirs standard verify_openssl
 
install_package "ruby-2.1.0" "https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.0.tar.bz2#1d3f4ad5f619ec15229206b6667586dcec7cc986672c8fbb8558161ecf07e277" warn_eol standard verify_openssl

share/ruby-build/2.1.0-dev

+1 −1
Original line number Diff line number Diff line 
install_package "openssl-1.0.2u" "https://www.openssl.org/source/openssl-1.0.2u.tar.gz#ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16" openssl --if needs_openssl_096_102

install_git "ruby-2.1.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_1" warn_eol ldflags_dirs autoconf standard verify_openssl
 
install_git "ruby-2.1.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_1" warn_eol autoconf standard verify_openssl

share/ruby-build/2.1.1

+1 −1
Original line number Diff line number Diff line 
install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749" --if needs_yaml

install_package "openssl-1.0.2u" "https://www.openssl.org/source/openssl-1.0.2u.tar.gz#ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16" openssl --if needs_openssl_096_102

install_package "ruby-2.1.1" "https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.1.tar.bz2#96aabab4dd4a2e57dd0d28052650e6fcdc8f133fa8980d9b936814b1e93f6cfc" warn_eol ldflags_dirs standard verify_openssl
 
install_package "ruby-2.1.1" "https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.1.tar.bz2#96aabab4dd4a2e57dd0d28052650e6fcdc8f133fa8980d9b936814b1e93f6cfc" warn_eol standard verify_openssl