RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10289 from jdurgin/wip-googletest-centos

Browse Source 
fix the rpm build for centos

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2016-07-14 07:48:35 -07:00 committed by GitHub
commit 6785393c04
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install-deps.sh
View File

@ -146,7 +146,14 @@ function activate_virtualenv() {
local env_dir=$top_srcdir/install-deps-$interpreter
if ! test -d $env_dir ; then
virtualenv --python $interpreter $env_dir
# Make a temporary virtualenv to get a fresh version of virtualenv
# because CentOS 7 has a buggy old version (v1.10.1)
# https://github.com/pypa/virtualenv/issues/463
virtualenv ${env_dir}_tmp
${env_dir}_tmp/bin/pip install --upgrade virtualenv
${env_dir}_tmp/bin/virtualenv --python $interpreter $env_dir
rm -rf ${env_dir}_tmp
. $env_dir/bin/activate
if ! populate_wheelhouse install ; then
rm -rf $env_dir

2
src/googletest

@ -1 +1 @@
Subproject commit 7f8609b0c2670e82fc0372b1610b33efd6be2070
Subproject commit fdb850479284e2aae047b87df6beae84236d0135