Re: [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3

From: Arnout Vandecappelle <arnout@mind.be>
To: Adam Duskett <aduskett@gmail.com>, buildroot@buildroot.org
Cc: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>,
	Samuel Martin <s.martin49@gmail.com>,
	Asaf Kahlon <asafka7@gmail.com>, Julien Olivain <ju.o@free.fr>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Oli Vogt <oli.vogt.pub01@gmail.com>
Subject: Re: [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3
Date: Mon, 25 Oct 2021 21:22:27 +0200	[thread overview]
Message-ID: <df8d1e98-e975-9cea-6eca-dc1acbba9f78@mind.be> (raw)
In-Reply-To: <20211014225849.832479-7-aduskett@gmail.com>

On 15/10/2021 00:58, Adam Duskett wrote:
> - Remove upstreamed patches
> - Add BR2_PACKAGE_PYTHON_CERTIFI and BR2_PACKAGE_QHULL as dependencies
> - Add a new file: setup.cfg. This file is needed to force matplotlib to use
>    the system-provided freetype and qhull, and to disable lto.
>    The setup.cfg file is copied to the source directory before configuring.
> 
> LTO must be disabled or else compile errors such as:
> "Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base'
> which may bind externally can not be used when making a shared object;
> recompile with -fPIC"
> 
> Signed-off-by: Adam Duskett <aduskett@gmail.com>

[snip]
> diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in
> index afc090856f..f38618d709 100644
> --- a/package/python-matplotlib/Config.in
> +++ b/package/python-matplotlib/Config.in
> @@ -6,6 +6,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB
>   	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
>   	select BR2_PACKAGE_FREETYPE # runtime
>   	select BR2_PACKAGE_LIBPNG # runtime
> +	select BR2_PACKAGE_PYTHON_CERTIFI

  Since you don't depend on it, I guess this is a runtime dependency, so I added 
that.

>   	select BR2_PACKAGE_PYTHON_CYCLER
>   	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
>   	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
> @@ -13,6 +14,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB
>   	select BR2_PACKAGE_PYTHON_NUMPY # runtime
>   	select BR2_PACKAGE_PYTHON_PYPARSING # runtime
>   	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
> +	select BR2_PACKAGE_QHULL
>   	select BR2_PACKAGE_ZLIB # runtime
>   	help
>   	  Matplotlib strives to produce publication quality 2D
> diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash
> index ccb22eefa5..81e83ac0de 100644
> --- a/package/python-matplotlib/python-matplotlib.hash
> +++ b/package/python-matplotlib/python-matplotlib.hash
> @@ -1,4 +1,4 @@
>   # sha256 from https://pypi.org/project/matplotlib/#files
> -sha256	e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7  matplotlib-3.0.3.tar.gz
> +sha256	fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318  matplotlib-3.4.3.tar.gz
>   # Locally computed sha256 checksums
>   sha256	5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc  LICENSE/LICENSE
> diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk
> index 8d00ac8a07..2f55dd5d5d 100644
> --- a/package/python-matplotlib/python-matplotlib.mk
> +++ b/package/python-matplotlib/python-matplotlib.mk
> @@ -4,17 +4,23 @@
>   #
>   ################################################################################
>   
> -PYTHON_MATPLOTLIB_VERSION = 3.0.3
> +PYTHON_MATPLOTLIB_VERSION = 3.4.3
>   PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz
> -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/26/04/8b381d5b166508cc258632b225adbafec49bbe69aa9a4fa1f1b461428313
> +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/21/37/197e68df384ff694f78d687a49ad39f96c67b8d75718bc61503e1676b617
>   PYTHON_MATPLOTLIB_LICENSE = Python-2.0
>   PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE
> -PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \
> -	libpng python-cycler
> +PYTHON_MATPLOTLIB_DEPENDENCIES = \
> +	host-pkgconf freetype host-python-numpy \
> +	libpng python-cycler host-python-certifi qhull

  I've taken the opportunity to make this one per line and sort alphabetically.

  Applied to master, thanks.

  Regards,
  Arnout

>   PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools
>   
>   ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y)
>   PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5
>   endif
>   
> +define PYTHON_MATPLOTLIB_COPY_SETUP_CFG
> +	cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/setup.cfg
> +endef
> +PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG
> +
>   $(eval $(python-package))
> diff --git a/package/python-matplotlib/setup.cfg b/package/python-matplotlib/setup.cfg
> new file mode 100644
> index 0000000000..4bda0d4376
> --- /dev/null
> +++ b/package/python-matplotlib/setup.cfg
> @@ -0,0 +1,10 @@
> +[libs]
> +# Disable LTO to prevent the following error:
> +# Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base'
> +# which may bind externally can not be used when making a shared object;
> +# recompile with -fPIC
> +enable_lto = False
> +
> +# Freetype and qhull are provided by Buildroot
> +system_freetype = True
> +system_qhull = True
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot