diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index fd8061b8e5..e40f324ddd 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -8,21 +8,16 @@ PKG_SHA256="e70284e8605a5b7ccb37e5bfd4634598ca2c43c7f2c353572351ccf72c031004" PKG_LICENSE="BSD" PKG_SITE="https://python-pillow.org/" PKG_URL="https://github.com/python-pillow/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host zlib freetype libjpeg-turbo tiff" +PKG_DEPENDS_TARGET="toolchain Python3 zlib freetype libjpeg-turbo tiff" PKG_LONGDESC="The Python Imaging Library adds image processing capabilities to your Python interpreter." PKG_TOOLCHAIN="manual" -pre_make_target() { - export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" - export LDSHARED="${CC} -shared" -} - make_target() { - python3 setup.py build --cross-compile + python_target_env python3 setup.py build_ext --disable-platform-guessing build } makeinstall_target() { - python3 setup.py install --root=${INSTALL} --prefix=/usr + exec_thread_safe python_target_env python3 setup.py build_ext --disable-platform-guessing install --root=${INSTALL} --prefix=/usr } post_makeinstall_target() { diff --git a/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch b/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch deleted file mode 100644 index 5d446b7080..0000000000 --- a/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/setup.py b/setup.py -index 8eb0b3c..277e44a 100755 ---- a/setup.py -+++ b/setup.py -@@ -341,9 +341,7 @@ - return True if value in configuration.get(option, []) else None - - def initialize_options(self): -- self.disable_platform_guessing = self.check_configuration( -- "platform-guessing", "disable" -- ) -+ self.disable_platform_guessing = True - self.add_imaging_libs = "" - build_ext.initialize_options(self) - for x in self.feature: -@@ -1007,6 +1005,7 @@ - - try: - setup( -+ version=PILLOW_VERSION, - cmdclass={"build_ext": pil_build_ext}, - ext_modules=ext_modules, - zip_safe=not (debug_build() or PLATFORM_MINGW),