mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-29 11:26:17 +03:00
Merge pull request #160 from radarhere/cmake_xz
Revert "Workaround problems with cmake and xz on manylinux2014"
This commit is contained in:
commit
d55456d975
10
config.sh
10
config.sh
|
@ -25,16 +25,6 @@ function pre_build {
|
||||||
if [ -n "$IS_OSX" ]; then
|
if [ -n "$IS_OSX" ]; then
|
||||||
# Update to latest zlib for OS X build
|
# Update to latest zlib for OS X build
|
||||||
build_new_zlib
|
build_new_zlib
|
||||||
elif [ $MB_ML_VER -eq 2014 ]; then
|
|
||||||
yum install -y cmake
|
|
||||||
|
|
||||||
function get_cmake {
|
|
||||||
echo cmake
|
|
||||||
}
|
|
||||||
|
|
||||||
function build_xz {
|
|
||||||
yum install -y xz-devel
|
|
||||||
}
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$IS_OSX" ]; then
|
if [ -n "$IS_OSX" ]; then
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit d1252d15e95712700865fe4a3e7c20f978efba03
|
Subproject commit c395b10e8395d43b51209760dc0853303ecfcd9e
|
Loading…
Reference in New Issue
Block a user