pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: CVS commit: pkgsrc/graphics/py-Pillow

On Nov 21, 2019, at 3:10 AM, Adam <adam%netbsd.org@localhost> wrote:

Module Name: pkgsrc
Committed By: minskim
Date: Wed Nov 20 23:34:36 UTC 2019

Modified Files:
pkgsrc/graphics/py-Pillow: distinfo
pkgsrc/graphics/py-Pillow/patches: patch-setup.py

Log Message:
graphics/py-Pillow: Skip zlib header search

pkgsrc always provides zlib.h.

This makes py-Pillow build on Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/py-Pillow/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/py-Pillow/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/py-Pillow/distinfo
diff -u pkgsrc/graphics/py-Pillow/distinfo:1.40 pkgsrc/graphics/py-Pillow/distinfo:1.41
--- pkgsrc/graphics/py-Pillow/distinfo:1.40 Tue Oct 22 18:45:02 2019
+++ pkgsrc/graphics/py-Pillow/distinfo Wed Nov 20 23:34:36 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.40 2019/10/22 18:45:02 adam Exp $
+$NetBSD: distinfo,v 1.41 2019/11/20 23:34:36 minskim Exp $

SHA1 (Pillow-6.2.1.tar.gz) = efb43a7be73f13cd300fa30f3f21634cfa3d6056
RMD160 (Pillow-6.2.1.tar.gz) = b6a0743f45072e5000f4d985dc1274d32bb7a40b
SHA512 (Pillow-6.2.1.tar.gz) = 757bfdab2ba418195e96e696d2d111de3b38b6bafe4f6f94012f024f59c9bc8542fdab54f643eaf7b2867a9214db806e72eecbdd636bfceb55b47d3164f643ec
Size (Pillow-6.2.1.tar.gz) = 37673162 bytes
-SHA1 (patch-setup.py) = 08af410697c6d0e01cf2c2b4955b8707a1807fdd
+SHA1 (patch-setup.py) = 5a7b2d56532e6688bfe1a0349d4c3136a7c26d2a

Index: pkgsrc/graphics/py-Pillow/patches/patch-setup.py
diff -u pkgsrc/graphics/py-Pillow/patches/patch-setup.py:1.21 pkgsrc/graphics/py-Pillow/patches/patch-setup.py:1.22
--- pkgsrc/graphics/py-Pillow/patches/patch-setup.py:1.21 Tue Oct 22 18:45:03 2019
+++ pkgsrc/graphics/py-Pillow/patches/patch-setup.py Wed Nov 20 23:34:36 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.21 2019/10/22 18:45:03 adam Exp $
+$NetBSD: patch-setup.py,v 1.22 2019/11/20 23:34:36 minskim Exp $

Disable mp_compile hack; it has problems with native parallel building.

@@ -25,3 +25,12 @@ Disable mp_compile hack; it has problems
        for x in self.feature:
            if getattr(self, "disable_%s" % x):
                setattr(self.feature, x, False)
+@@ -539,7 +532,7 @@ class pil_build_ext(build_ext):
+ 
+         if feature.want("zlib"):
+             _dbg("Looking for zlib")
+-            if _find_include_file(self, "zlib.h"):
++            if True or _find_include_file(self, "zlib.h"):
+                 if _find_library_file(self, "z"):
+                     feature.zlib = "z"
+                 elif sys.platform == "win32" and _find_library_file(self, "zlib"):

This seems wrong.

What error do you get when you don't apply this patch?

The message from setup.py:

    The headers or library files could not be found for zlib,
    a required dependency when compiling Pillow from source.

See the full build log below.

Which macOS version do you try?

It's newly-installed Catalina. The command-line tools were installed with "xcode-select --install" (no /usr/include).

Full build log:

=> Bootstrap dependency digest>=20010302: found digest-20190127
===> Building for py37-Pillow-6.2.1
(cd /opt/pkgsrc/graphics/py-Pillow/work/Pillow-6.2.1/ && /usr/bin/env USETOOLS=no PTHREAD_CFLAGS=\ -D_REENTRANT PTHREAD_LDFLAGS= PTHREAD_LIBS=-lpthread PTHREADBASE= DL_CFLAGS= DL_LDFLAGS= DL_LIBS= PYTHON=/opt/pkg/bin/python3.7 CC=clang CFLAGS=-O2\ -march=haswell\ -mmacosx-version-min=10.15\ -I/opt/pkg/include/freetype2\ -I/opt/pkg/include\ -I/opt/pkg/include/python3.7 CPPFLAGS=-I/opt/pkg/include/freetype2\ -I/opt/pkg/include\ -I/opt/pkg/include/python3.7 CXX=clang++ CXXFLAGS=-O2\ -march=haswell\ -mmacosx-version-min=10.15\ -I/opt/pkg/include/freetype2\ -I/opt/pkg/include\ -I/opt/pkg/include/python3.7\ -O2\ -march=haswell\ -mmacosx-version-min=10.15\ -I/opt/pkg/include/freetype2\ -I/opt/pkg/include\ -I/opt/pkg/include/python3.7 COMPILER_RPATH_FLAG=-L F77=f77 FC=f77 FFLAGS=-O\ -O2\ -march=haswell\ -mmacosx-version-min=10.15\ -I/opt/pkg/include/freetype2\ -I/opt/pkg/include\ -I/opt/pkg/include/python3.7 LANG=C LC_ALL=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LDFLAGS=-L/usr/lib\ -L/opt/pkg/lib LINKER_RPATH_FLAG=-L PATH=/opt/pkgsrc/graphics/py-Pillow/work/.cwrapper/bin:/opt/pkgsrc/graphics/py-Pillow/work/.buildlink/bin:/opt/pkgsrc/graphics/py-Pillow/work/.tools/bin:/opt/pkg/bin:/Users/msk/.cargo/bin:/Users/msk/.cargo/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/pkg/bin:/opt/pkg/sbin:/opt/pkg/bin:/opt/X11/bin PREFIX=/opt/pkg MAKELEVEL=0 CONFIG_SITE= PKG_SYSCONFDIR=/opt/pkg/etc CXXCPP=clang\ -E HOME=/opt/pkgsrc/graphics/py-Pillow/work/.home CWRAPPERS_CONFIG_DIR=/opt/pkgsrc/graphics/py-Pillow/work/.cwrapper/config CPP=clang\ -E LOCALBASE=/opt/pkg X11BASE=/opt/X11 PKGMANDIR=man PKGINFODIR=info PKGGNUDIR=gnu/ MAKECONF=/dev/null OBJECT_FMT=Mach-O USETOOLS=no BSD_INSTALL_PROGRAM=/usr/bin/install\ -c\ \ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_SCRIPT=/usr/bin/install\ -c\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_LIB=/usr/bin/install\ -c\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_DATA=/usr/bin/install\ -c\ -o\ pbulk\ -g\ staff\ -m\ 644 BSD_INSTALL_MAN=/usr/bin/install\ -c\ -o\ pbulk\ -g\ staff\ -m\ 644 BSD_INSTALL=/usr/bin/install BSD_INSTALL_PROGRAM_DIR=/usr/bin/install\ -d\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_SCRIPT_DIR=/usr/bin/install\ -d\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_LIB_DIR=/usr/bin/install\ -d\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_DATA_DIR=/usr/bin/install\ -d\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_MAN_DIR=/usr/bin/install\ -d\ -o\ pbulk\ -g\ staff\ -m\ 755 BSD_INSTALL_GAME=/usr/bin/install\ -c\ \ -o\ pbulk\ -g\ staff\ -m\ 2555 BSD_INSTALL_GAME_DATA=/usr/bin/install\ -c\ -o\ pbulk\ -g\ staff\ -m\ 664 BSD_INSTALL_GAME_DIR=/usr/bin/install\ -d\ -o\ pbulk\ -g\ staff\ -m\ 775 INSTALL_INFO= MAKEINFO=/opt/pkgsrc/graphics/py-Pillow/work/.tools/bin/makeinfo FLEX= BISON= PKG_CONFIG=/opt/pkgsrc/graphics/py-Pillow/work/.tools/bin/pkg-config PKG_CONFIG_LIBDIR=/opt/pkgsrc/graphics/py-Pillow/work/.buildlink/lib/pkgconfig:/opt/pkgsrc/graphics/py-Pillow/work/.buildlink/share/pkgconfig PKG_CONFIG_LOG=/opt/pkgsrc/graphics/py-Pillow/work/.pkg-config.log PKG_CONFIG_PATH= CWRAPPERS_CONFIG_DIR=/opt/pkgsrc/graphics/py-Pillow/work/.cwrapper/config /opt/pkg/bin/python3.7  setup.py  build  -j4)
running build
running build_py
creating build
creating build/lib.macosx-10.15-x86_64-3.7
creating build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/MpoImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageMode.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PngImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/XbmImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PcxImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/SunImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/SpiderImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/TarIO.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/FitsStubImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/MpegImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/BdfFontFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/GribStubImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageStat.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PixarImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/GimpPaletteFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageColor.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ContainerIO.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/MspImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/MicImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/_version.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImtImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/GifImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PalmImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageQt.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageMath.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PaletteFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/FontFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PdfParser.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ExifTags.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageCms.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/FpxImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageChops.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/BufrStubImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PSDraw.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PcdImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageFilter.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageDraw2.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImagePath.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/DcxImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/__init__.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/JpegPresets.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/Hdf5StubImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/features.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageDraw.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/GimpGradientFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageWin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/IcoImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/_tkinter_finder.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/EpsImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/TgaImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageMorph.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/Jpeg2KImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/WalImageFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PcfFontFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/BlpImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageTk.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/GbrImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageOps.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PdfImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageShow.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageEnhance.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/WmfImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageGrab.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/WebPImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/FliImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/TiffTags.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/CurImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/_util.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/GdImageFile.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/TiffImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/IptcImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImagePalette.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/BmpImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageTransform.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/IcnsImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/McIdasImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/XpmImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/DdsImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageSequence.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PyAccess.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/_binary.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/Image.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/__main__.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/XVThumbImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/SgiImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PsdImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/JpegImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/ImageFont.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/PpmImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
copying src/PIL/FtexImagePlugin.py -> build/lib.macosx-10.15-x86_64-3.7/PIL
running egg_info
writing src/Pillow.egg-info/PKG-INFO
writing dependency_links to src/Pillow.egg-info/dependency_links.txt
writing top-level names to src/Pillow.egg-info/top_level.txt
reading manifest file 'src/Pillow.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching '*.c'
warning: no files found matching '*.h'
warning: no files found matching '*.sh'
warning: no previously-included files found matching '.appveyor.yml'
warning: no previously-included files found matching '.coveragerc'
warning: no previously-included files found matching '.codecov.yml'
warning: no previously-included files found matching '.editorconfig'
warning: no previously-included files found matching '.readthedocs.yml'
warning: no previously-included files found matching 'azure-pipelines.yml'
warning: no previously-included files matching '.git*' found anywhere in distribution
warning: no previously-included files matching '*.pyc' found anywhere in distribution
warning: no previously-included files matching '*.so' found anywhere in distribution
no previously-included directories found matching '.azure-pipelines'
no previously-included directories found matching '.travis'
writing manifest file 'src/Pillow.egg-info/SOURCES.txt'
running build_ext


The headers or library files could not be found for zlib,
a required dependency when compiling Pillow from source.

Please see the install instructions at:
   https://pillow.readthedocs.io/en/latest/installation.html

Traceback (most recent call last):
  File "setup.py", line 881, in <module>
    zip_safe=not (debug_build() or PLATFORM_MINGW),
  File "/opt/pkg/lib/python3.7/site-packages/setuptools/__init__.py", line 145, in setup
    return distutils.core.setup(**attrs)
  File "/opt/pkg/lib/python3.7/distutils/core.py", line 148, in setup
    dist.run_commands()
  File "/opt/pkg/lib/python3.7/distutils/dist.py", line 966, in run_commands
    self.run_command(cmd)
  File "/opt/pkg/lib/python3.7/distutils/dist.py", line 985, in run_command
    cmd_obj.run()
  File "/opt/pkg/lib/python3.7/distutils/command/build.py", line 135, in run
    self.run_command(cmd_name)
  File "/opt/pkg/lib/python3.7/distutils/cmd.py", line 313, in run_command
    self.distribution.run_command(command)
  File "/opt/pkg/lib/python3.7/distutils/dist.py", line 985, in run_command
    cmd_obj.run()
  File "/opt/pkg/lib/python3.7/distutils/command/build_ext.py", line 340, in run
    self.build_extensions()
  File "setup.py", line 680, in build_extensions
    raise RequiredDependencyException(f)
__main__.RequiredDependencyException: zlib

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "setup.py", line 896, in <module>
    raise RequiredDependencyException(msg)
__main__.RequiredDependencyException: 

The headers or library files could not be found for zlib,
a required dependency when compiling Pillow from source.

Please see the install instructions at:
   https://pillow.readthedocs.io/en/latest/installation.html


*** Error code 1

Stop.
bmake[1]: stopped in /opt/pkgsrc/graphics/py-Pillow
*** Error code 1

Stop.
bmake: stopped in /opt/pkgsrc/graphics/py-Pillow


Regards,
Min

Home | Main Index | Thread Index | Old Index