mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-27 01:34:24 +03:00
Fixes to run cleanly on alpine linux
This commit is contained in:
parent
2af16a7b58
commit
ac51f1ee37
9
setup.py
9
setup.py
|
@ -405,6 +405,8 @@ class pil_build_ext(build_ext):
|
||||||
|
|
||||||
_add_directory(library_dirs, "/usr/lib")
|
_add_directory(library_dirs, "/usr/lib")
|
||||||
_add_directory(include_dirs, "/usr/include")
|
_add_directory(include_dirs, "/usr/include")
|
||||||
|
# alpine, at least
|
||||||
|
_add_directory(library_dirs, "/lib")
|
||||||
|
|
||||||
# on Windows, look for the OpenJPEG libraries in the location that
|
# on Windows, look for the OpenJPEG libraries in the location that
|
||||||
# the official installer puts them
|
# the official installer puts them
|
||||||
|
@ -789,8 +791,11 @@ class pil_build_ext(build_ext):
|
||||||
if not os.path.exists(self.build_temp):
|
if not os.path.exists(self.build_temp):
|
||||||
os.makedirs(self.build_temp)
|
os.makedirs(self.build_temp)
|
||||||
with open(tmpfile, 'wb') as fp:
|
with open(tmpfile, 'wb') as fp:
|
||||||
ret = subprocess.call([
|
try:
|
||||||
'dpkg-architecture', '-qDEB_HOST_MULTIARCH'], stdout=fp)
|
ret = subprocess.call(['dpkg-architecture',
|
||||||
|
'-qDEB_HOST_MULTIARCH'], stdout=fp)
|
||||||
|
except:
|
||||||
|
return
|
||||||
try:
|
try:
|
||||||
if ret >> 8 == 0:
|
if ret >> 8 == 0:
|
||||||
fp = open(tmpfile, 'r')
|
fp = open(tmpfile, 'r')
|
||||||
|
|
Loading…
Reference in New Issue
Block a user