Skip to content
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

Jump to bottom

fix the rpm build for centos #10289

Merged
merged 2 commits into from Jul 14, 2016
Merged

fix the rpm build for centos #10289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9a829d
googletest: avoid installing any pieces of it
jdurgin Jul 13, 2016
2699b6d
install-deps: Get the latest virtualenv in a temporary folder
oprypin Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion install-deps.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/googletest
Open in desktop
Submodule googletest updated 2 files
+4 −4 googlemock/CMakeLists.txt
+4 −4 googletest/CMakeLists.txt