* [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package
@ 2021-02-12 6:39 Fabrice Fontaine
2021-02-12 6:39 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig Fabrice Fontaine
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Fabrice Fontaine @ 2021-02-12 6:39 UTC (permalink / raw)
To: buildroot
host-perl-extutils-pkgconfig is needed by perl-gd to find gd in version
2.3.0
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Fran?ois Perrad):
- Add host-pkgconf dependency
package/perl-extutils-pkgconfig/Config.in | 6 ++++++
.../perl-extutils-pkgconfig.hash | 6 ++++++
.../perl-extutils-pkgconfig.mk | 15 +++++++++++++++
3 files changed, 27 insertions(+)
create mode 100644 package/perl-extutils-pkgconfig/Config.in
create mode 100644 package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
create mode 100644 package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
diff --git a/package/perl-extutils-pkgconfig/Config.in b/package/perl-extutils-pkgconfig/Config.in
new file mode 100644
index 0000000000..f3c4966fe1
--- /dev/null
+++ b/package/perl-extutils-pkgconfig/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PERL_EXTUTILS_PKGCONFIG
+ bool "perl-extutils-pkgconfig"
+ help
+ simplistic interface to pkg-config.
+
+ http://gtk2-perl.sourceforge.net
diff --git a/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
new file mode 100644
index 0000000000..7028b96be5
--- /dev/null
+++ b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
@@ -0,0 +1,6 @@
+# retrieved by scancpan from http://cpan.metacpan.org/
+md5 b86318f2b6ac6af3ee985299e1e38fe5 ExtUtils-PkgConfig-1.16.tar.gz
+sha256 bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e ExtUtils-PkgConfig-1.16.tar.gz
+
+# computed by scancpan
+sha256 1ca66d6d9d2e14426825889848f0b5b4d4e153afcd74b8f42a1f2937c3a9973d README
diff --git a/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
new file mode 100644
index 0000000000..21b1af2025
--- /dev/null
+++ b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# perl-extutils-pkgconfig
+#
+################################################################################
+
+PERL_EXTUTILS_PKGCONFIG_VERSION = 1.16
+PERL_EXTUTILS_PKGCONFIG_SOURCE = ExtUtils-PkgConfig-$(PERL_EXTUTILS_PKGCONFIG_VERSION).tar.gz
+PERL_EXTUTILS_PKGCONFIG_SITE = $(BR2_CPAN_MIRROR)/authors/id/X/XA/XAOC
+PERL_EXTUTILS_PKGCONFIG_LICENSE = LGPL-2.1
+PERL_EXTUTILS_PKGCONFIG_LICENSE_FILES = README
+PERL_EXTUTILS_PKGCONFIG_DISTNAME = ExtUtils-PkgConfig
+PERL_EXTUTILS_PKGCONFIG_DEPENDENCIES = host-pkgconf
+
+$(eval $(host-perl-package))
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig
2021-02-12 6:39 [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package Fabrice Fontaine
@ 2021-02-12 6:39 ` Fabrice Fontaine
2021-02-12 12:01 ` François Perrad
2021-02-16 20:50 ` Arnout Vandecappelle
2021-02-12 6:39 ` [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options Fabrice Fontaine
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Fabrice Fontaine @ 2021-02-12 6:39 UTC (permalink / raw)
To: buildroot
Commit 3a291be2e89bc64388c10dae50233c751a86733d forgot to add
perl-extutils-pkgconfig dependency
Fixes:
- http://autobuild.buildroot.org/results/e590f1990180eae21512b23b884755e105a4c588
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Fran?ois Perrad):
- Drop host-pkgconf dependency
...-fix-cross-compilation-with-gdlib.pc.patch | 34 +++++++++++++++++++
package/perl-gd/perl-gd.mk | 6 +++-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
new file mode 100644
index 0000000000..af053c5605
--- /dev/null
+++ b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
@@ -0,0 +1,34 @@
+From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 24 Jan 2021 10:59:31 +0100
+Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc
+
+Cross-compilation will fail if gdlib.pc does not contain any cflags.
+Indeed, if cflags is empty, Makefile.PL will use the default value for
+INC (i.e. -I/usr/include -I/usr/include/gd)
+
+It should be noted that gdlib-config has been dropped from gd since
+version 2.3.0
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: probably not upstreamable]
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 25f2f93..7da3651 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option -
+ END
+ }
+
+- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC;
++#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC;
+ @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
+ @LIBS = qw(-lgd) unless @LIBS;
+
+--
+2.29.2
+
diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
index b058672a23..2932b686bb 100644
--- a/package/perl-gd/perl-gd.mk
+++ b/package/perl-gd/perl-gd.mk
@@ -7,11 +7,15 @@
PERL_GD_VERSION = 2.73
PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
-PERL_GD_DEPENDENCIES = host-pkgconf zlib libpng freetype gd
+PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib libpng freetype gd
PERL_GD_LICENSE = Artistic or GPL-1.0+
PERL_GD_LICENSE_FILES = LICENSE
PERL_GD_DISTNAME = GD
+PERL_GD_CONF_ENV = \
+ PATH=$(BR_PATH) \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+
PERL_GD_CONF_OPTS = \
-lib_gd_path=$(STAGING_DIR)/usr \
-lib_ft_path=$(STAGING_DIR)/usr \
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options
2021-02-12 6:39 [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package Fabrice Fontaine
2021-02-12 6:39 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig Fabrice Fontaine
@ 2021-02-12 6:39 ` Fabrice Fontaine
2021-02-12 12:02 ` François Perrad
2021-02-16 20:51 ` Arnout Vandecappelle
2021-02-12 12:01 ` [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package François Perrad
2021-02-16 20:35 ` Arnout Vandecappelle
3 siblings, 2 replies; 9+ messages in thread
From: Fabrice Fontaine @ 2021-02-12 6:39 UTC (permalink / raw)
To: buildroot
Now that gdlib-config is gone, provide the GD options otherwise perl-gd
will assume that everything is available:
$features = 'GD_GIF GD_GIFANIM GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE GD_FONTCONFIG GD_JPEG GD_XPM GD_TIFF GD_WEBP';
Also, while at it, also make some of the dependencies as optional as
suggested by Fran?ois Perrad
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Fran?ois Perrad):
- Handle dependencies
package/perl-gd/Config.in | 2 --
package/perl-gd/perl-gd.mk | 39 +++++++++++++++++++++++++++++++++-----
2 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/package/perl-gd/Config.in b/package/perl-gd/Config.in
index ef28f7b971..044e601021 100644
--- a/package/perl-gd/Config.in
+++ b/package/perl-gd/Config.in
@@ -2,8 +2,6 @@ config BR2_PACKAGE_PERL_GD
bool "perl-gd"
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_LIBPNG
- select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_GD
help
Perl interface to the gd2 graphics library.
diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
index 2932b686bb..b402dfff49 100644
--- a/package/perl-gd/perl-gd.mk
+++ b/package/perl-gd/perl-gd.mk
@@ -7,7 +7,7 @@
PERL_GD_VERSION = 2.73
PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
-PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib libpng freetype gd
+PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd
PERL_GD_LICENSE = Artistic or GPL-1.0+
PERL_GD_LICENSE_FILES = LICENSE
PERL_GD_DISTNAME = GD
@@ -16,10 +16,39 @@ PERL_GD_CONF_ENV = \
PATH=$(BR_PATH) \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
-PERL_GD_CONF_OPTS = \
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+PERL_GD_DEPENDENCIES += fontconfig
+PERL_GD_OPTIONS += FONTCONFIG
+PERL_GD_CONF_OPTS += -lib_fontconfig_path=$(STAGING_DIR)/usr
+endif
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+PERL_GD_DEPENDENCIES += freetype
+PERL_GD_OPTIONS += FT
+PERL_GD_CONF_OPTS += -lib_ft_path=$(STAGING_DIR)/usr
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+PERL_GD_DEPENDENCIES += jpeg
+PERL_GD_OPTIONS += JPEG
+PERL_GD_CONF_OPTS += -lib_jpeg_path=$(STAGING_DIR)/usr
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+PERL_GD_DEPENDENCIES += libpng
+PERL_GD_OPTIONS += PNG
+PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
+PERL_GD_DEPENDENCIES += xlib_libXpm
+PERL_GD_OPTIONS += XPM
+PERL_GD_CONF_OPTS += -lib_xpm_path=$(STAGING_DIR)/usr
+endif
+
+PERL_GD_CONF_OPTS += \
-lib_gd_path=$(STAGING_DIR)/usr \
- -lib_ft_path=$(STAGING_DIR)/usr \
- -lib_png_path=$(STAGING_DIR)/usr \
- -lib_zlib_path=$(STAGING_DIR)/usr
+ -lib_zlib_path=$(STAGING_DIR)/usr \
+ -options=$(subst $(space),$(comma),$(PERL_GD_OPTIONS))
$(eval $(perl-package))
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package
2021-02-12 6:39 [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package Fabrice Fontaine
2021-02-12 6:39 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig Fabrice Fontaine
2021-02-12 6:39 ` [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options Fabrice Fontaine
@ 2021-02-12 12:01 ` François Perrad
2021-02-16 20:35 ` Arnout Vandecappelle
3 siblings, 0 replies; 9+ messages in thread
From: François Perrad @ 2021-02-12 12:01 UTC (permalink / raw)
To: buildroot
Le ven. 12 f?vr. 2021 ? 07:41, Fabrice Fontaine <fontaine.fabrice@gmail.com>
a ?crit :
> host-perl-extutils-pkgconfig is needed by perl-gd to find gd in version
> 2.3.0
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
Acked-by: Francois Perrad <francois.perrad@gadz.org>
---
> Changes v1 -> v2 (after review of Fran?ois Perrad):
> - Add host-pkgconf dependency
>
> package/perl-extutils-pkgconfig/Config.in | 6 ++++++
> .../perl-extutils-pkgconfig.hash | 6 ++++++
> .../perl-extutils-pkgconfig.mk | 15 +++++++++++++++
> 3 files changed, 27 insertions(+)
> create mode 100644 package/perl-extutils-pkgconfig/Config.in
> create mode 100644
> package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> create mode 100644 package/perl-extutils-pkgconfig/
> perl-extutils-pkgconfig.mk
>
> diff --git a/package/perl-extutils-pkgconfig/Config.in
> b/package/perl-extutils-pkgconfig/Config.in
> new file mode 100644
> index 0000000000..f3c4966fe1
> --- /dev/null
> +++ b/package/perl-extutils-pkgconfig/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_PERL_EXTUTILS_PKGCONFIG
> + bool "perl-extutils-pkgconfig"
> + help
> + simplistic interface to pkg-config.
> +
> + http://gtk2-perl.sourceforge.net
> diff --git a/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> new file mode 100644
> index 0000000000..7028b96be5
> --- /dev/null
> +++ b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> @@ -0,0 +1,6 @@
> +# retrieved by scancpan from http://cpan.metacpan.org/
> +md5 b86318f2b6ac6af3ee985299e1e38fe5 ExtUtils-PkgConfig-1.16.tar.gz
> +sha256 bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e
> ExtUtils-PkgConfig-1.16.tar.gz
> +
> +# computed by scancpan
> +sha256 1ca66d6d9d2e14426825889848f0b5b4d4e153afcd74b8f42a1f2937c3a9973d
> README
> diff --git a/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
> b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
> new file mode 100644
> index 0000000000..21b1af2025
> --- /dev/null
> +++ b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
> @@ -0,0 +1,15 @@
>
> +################################################################################
> +#
> +# perl-extutils-pkgconfig
> +#
>
> +################################################################################
> +
> +PERL_EXTUTILS_PKGCONFIG_VERSION = 1.16
> +PERL_EXTUTILS_PKGCONFIG_SOURCE =
> ExtUtils-PkgConfig-$(PERL_EXTUTILS_PKGCONFIG_VERSION).tar.gz
> +PERL_EXTUTILS_PKGCONFIG_SITE = $(BR2_CPAN_MIRROR)/authors/id/X/XA/XAOC
> +PERL_EXTUTILS_PKGCONFIG_LICENSE = LGPL-2.1
> +PERL_EXTUTILS_PKGCONFIG_LICENSE_FILES = README
> +PERL_EXTUTILS_PKGCONFIG_DISTNAME = ExtUtils-PkgConfig
> +PERL_EXTUTILS_PKGCONFIG_DEPENDENCIES = host-pkgconf
> +
> +$(eval $(host-perl-package))
> --
> 2.29.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210212/9572fc4c/attachment.html>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig
2021-02-12 6:39 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig Fabrice Fontaine
@ 2021-02-12 12:01 ` François Perrad
2021-02-16 20:50 ` Arnout Vandecappelle
1 sibling, 0 replies; 9+ messages in thread
From: François Perrad @ 2021-02-12 12:01 UTC (permalink / raw)
To: buildroot
Le ven. 12 f?vr. 2021 ? 07:41, Fabrice Fontaine <fontaine.fabrice@gmail.com>
a ?crit :
> Commit 3a291be2e89bc64388c10dae50233c751a86733d forgot to add
> perl-extutils-pkgconfig dependency
>
> Fixes:
> -
> http://autobuild.buildroot.org/results/e590f1990180eae21512b23b884755e105a4c588
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
Acked-by: Francois Perrad <francois.perrad@gadz.org>
---
> Changes v1 -> v2 (after review of Fran?ois Perrad):
> - Drop host-pkgconf dependency
>
> ...-fix-cross-compilation-with-gdlib.pc.patch | 34 +++++++++++++++++++
> package/perl-gd/perl-gd.mk | 6 +++-
> 2 files changed, 39 insertions(+), 1 deletion(-)
> create mode 100644
> package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
>
> diff --git
> a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
> b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
> new file mode 100644
> index 0000000000..af053c5605
> --- /dev/null
> +++
> b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
> @@ -0,0 +1,34 @@
> +From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 24 Jan 2021 10:59:31 +0100
> +Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc
> +
> +Cross-compilation will fail if gdlib.pc does not contain any cflags.
> +Indeed, if cflags is empty, Makefile.PL will use the default value for
> +INC (i.e. -I/usr/include -I/usr/include/gd)
> +
> +It should be noted that gdlib-config has been dropped from gd since
> +version 2.3.0
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: probably not upstreamable]
> +---
> + Makefile.PL | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.PL b/Makefile.PL
> +index 25f2f93..7da3651 100644
> +--- a/Makefile.PL
> ++++ b/Makefile.PL
> +@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this
> script with the option -
> + END
> + }
> +
> +- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC;
> ++#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC;
> + @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib)
> unless @LIBPATH;
> + @LIBS = qw(-lgd) unless @LIBS;
> +
> +--
> +2.29.2
> +
> diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
> index b058672a23..2932b686bb 100644
> --- a/package/perl-gd/perl-gd.mk
> +++ b/package/perl-gd/perl-gd.mk
> @@ -7,11 +7,15 @@
> PERL_GD_VERSION = 2.73
> PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
> PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
> -PERL_GD_DEPENDENCIES = host-pkgconf zlib libpng freetype gd
> +PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib libpng freetype
> gd
> PERL_GD_LICENSE = Artistic or GPL-1.0+
> PERL_GD_LICENSE_FILES = LICENSE
> PERL_GD_DISTNAME = GD
>
> +PERL_GD_CONF_ENV = \
> + PATH=$(BR_PATH) \
> + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
> +
> PERL_GD_CONF_OPTS = \
> -lib_gd_path=$(STAGING_DIR)/usr \
> -lib_ft_path=$(STAGING_DIR)/usr \
> --
> 2.29.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210212/50d108e7/attachment.html>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options
2021-02-12 6:39 ` [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options Fabrice Fontaine
@ 2021-02-12 12:02 ` François Perrad
2021-02-16 20:51 ` Arnout Vandecappelle
1 sibling, 0 replies; 9+ messages in thread
From: François Perrad @ 2021-02-12 12:02 UTC (permalink / raw)
To: buildroot
Le ven. 12 f?vr. 2021 ? 07:41, Fabrice Fontaine <fontaine.fabrice@gmail.com>
a ?crit :
> Now that gdlib-config is gone, provide the GD options otherwise perl-gd
> will assume that everything is available:
>
> $features = 'GD_GIF GD_GIFANIM GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE
> GD_FONTCONFIG GD_JPEG GD_XPM GD_TIFF GD_WEBP';
>
> Also, while at it, also make some of the dependencies as optional as
> suggested by Fran?ois Perrad
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
Tested-by: Francois Perrad <francois.perrad@gadz.org> (with
tests.package.test_perl_gdgraph)
> ---
> Changes v1 -> v2 (after review of Fran?ois Perrad):
> - Handle dependencies
>
> package/perl-gd/Config.in | 2 --
> package/perl-gd/perl-gd.mk | 39 +++++++++++++++++++++++++++++++++-----
> 2 files changed, 34 insertions(+), 7 deletions(-)
>
> diff --git a/package/perl-gd/Config.in b/package/perl-gd/Config.in
> index ef28f7b971..044e601021 100644
> --- a/package/perl-gd/Config.in
> +++ b/package/perl-gd/Config.in
> @@ -2,8 +2,6 @@ config BR2_PACKAGE_PERL_GD
> bool "perl-gd"
> depends on !BR2_STATIC_LIBS
> select BR2_PACKAGE_ZLIB
> - select BR2_PACKAGE_LIBPNG
> - select BR2_PACKAGE_FREETYPE
> select BR2_PACKAGE_GD
> help
> Perl interface to the gd2 graphics library.
> diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
> index 2932b686bb..b402dfff49 100644
> --- a/package/perl-gd/perl-gd.mk
> +++ b/package/perl-gd/perl-gd.mk
> @@ -7,7 +7,7 @@
> PERL_GD_VERSION = 2.73
> PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
> PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
> -PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib libpng freetype
> gd
> +PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd
> PERL_GD_LICENSE = Artistic or GPL-1.0+
> PERL_GD_LICENSE_FILES = LICENSE
> PERL_GD_DISTNAME = GD
> @@ -16,10 +16,39 @@ PERL_GD_CONF_ENV = \
> PATH=$(BR_PATH) \
> PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
>
> -PERL_GD_CONF_OPTS = \
> +ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
> +PERL_GD_DEPENDENCIES += fontconfig
> +PERL_GD_OPTIONS += FONTCONFIG
> +PERL_GD_CONF_OPTS += -lib_fontconfig_path=$(STAGING_DIR)/usr
> +endif
> +
> +ifeq ($(BR2_PACKAGE_FREETYPE),y)
> +PERL_GD_DEPENDENCIES += freetype
> +PERL_GD_OPTIONS += FT
> +PERL_GD_CONF_OPTS += -lib_ft_path=$(STAGING_DIR)/usr
> +endif
> +
> +ifeq ($(BR2_PACKAGE_JPEG),y)
> +PERL_GD_DEPENDENCIES += jpeg
> +PERL_GD_OPTIONS += JPEG
> +PERL_GD_CONF_OPTS += -lib_jpeg_path=$(STAGING_DIR)/usr
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBPNG),y)
> +PERL_GD_DEPENDENCIES += libpng
> +PERL_GD_OPTIONS += PNG
> +PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr
> +endif
> +
> +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
> +PERL_GD_DEPENDENCIES += xlib_libXpm
> +PERL_GD_OPTIONS += XPM
> +PERL_GD_CONF_OPTS += -lib_xpm_path=$(STAGING_DIR)/usr
> +endif
> +
> +PERL_GD_CONF_OPTS += \
> -lib_gd_path=$(STAGING_DIR)/usr \
> - -lib_ft_path=$(STAGING_DIR)/usr \
> - -lib_png_path=$(STAGING_DIR)/usr \
> - -lib_zlib_path=$(STAGING_DIR)/usr
> + -lib_zlib_path=$(STAGING_DIR)/usr \
> + -options=$(subst $(space),$(comma),$(PERL_GD_OPTIONS))
>
> $(eval $(perl-package))
> --
> 2.29.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210212/59d47057/attachment.html>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package
2021-02-12 6:39 [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package Fabrice Fontaine
` (2 preceding siblings ...)
2021-02-12 12:01 ` [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package François Perrad
@ 2021-02-16 20:35 ` Arnout Vandecappelle
3 siblings, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2021-02-16 20:35 UTC (permalink / raw)
To: buildroot
On 12/02/2021 07:39, Fabrice Fontaine wrote:
> host-perl-extutils-pkgconfig is needed by perl-gd to find gd in version
> 2.3.0
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Fran?ois Perrad):
> - Add host-pkgconf dependency
>
> package/perl-extutils-pkgconfig/Config.in | 6 ++++++
> .../perl-extutils-pkgconfig.hash | 6 ++++++
> .../perl-extutils-pkgconfig.mk | 15 +++++++++++++++
> 3 files changed, 27 insertions(+)
> create mode 100644 package/perl-extutils-pkgconfig/Config.in
> create mode 100644 package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> create mode 100644 package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
>
> diff --git a/package/perl-extutils-pkgconfig/Config.in b/package/perl-extutils-pkgconfig/Config.in
> new file mode 100644
> index 0000000000..f3c4966fe1
> --- /dev/null
> +++ b/package/perl-extutils-pkgconfig/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_PERL_EXTUTILS_PKGCONFIG
> + bool "perl-extutils-pkgconfig"
Since this is a host-only package, Config.in is useless. And anyway it was not
sourced from package/Config.in.
> + help
> + simplistic interface to pkg-config.
> +
> + http://gtk2-perl.sourceforge.net
> diff --git a/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> new file mode 100644
> index 0000000000..7028b96be5
> --- /dev/null
> +++ b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash
> @@ -0,0 +1,6 @@
> +# retrieved by scancpan from http://cpan.metacpan.org/
> +md5 b86318f2b6ac6af3ee985299e1e38fe5 ExtUtils-PkgConfig-1.16.tar.gz
> +sha256 bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e ExtUtils-PkgConfig-1.16.tar.gz
> +
> +# computed by scancpan
> +sha256 1ca66d6d9d2e14426825889848f0b5b4d4e153afcd74b8f42a1f2937c3a9973d README
> diff --git a/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
> new file mode 100644
> index 0000000000..21b1af2025
> --- /dev/null
> +++ b/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk
> @@ -0,0 +1,15 @@
> +################################################################################
> +#
> +# perl-extutils-pkgconfig
> +#
> +################################################################################
> +
> +PERL_EXTUTILS_PKGCONFIG_VERSION = 1.16
> +PERL_EXTUTILS_PKGCONFIG_SOURCE = ExtUtils-PkgConfig-$(PERL_EXTUTILS_PKGCONFIG_VERSION).tar.gz
> +PERL_EXTUTILS_PKGCONFIG_SITE = $(BR2_CPAN_MIRROR)/authors/id/X/XA/XAOC
> +PERL_EXTUTILS_PKGCONFIG_LICENSE = LGPL-2.1
> +PERL_EXTUTILS_PKGCONFIG_LICENSE_FILES = README
> +PERL_EXTUTILS_PKGCONFIG_DISTNAME = ExtUtils-PkgConfig
> +PERL_EXTUTILS_PKGCONFIG_DEPENDENCIES = host-pkgconf
This doesn't work for the host package, should be HOST_PERL_..._DEPENDENCIES.
Also, you forgot to add to DEVELOPERS.
Fixed all that and applied to master, thanks.
Regards,
Arnout
> +
> +$(eval $(host-perl-package))
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig
2021-02-12 6:39 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig Fabrice Fontaine
2021-02-12 12:01 ` François Perrad
@ 2021-02-16 20:50 ` Arnout Vandecappelle
1 sibling, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2021-02-16 20:50 UTC (permalink / raw)
To: buildroot
On 12/02/2021 07:39, Fabrice Fontaine wrote:
> Commit 3a291be2e89bc64388c10dae50233c751a86733d forgot to add
> perl-extutils-pkgconfig dependency
>
> Fixes:
> - http://autobuild.buildroot.org/results/e590f1990180eae21512b23b884755e105a4c588
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Fran?ois Perrad):
> - Drop host-pkgconf dependency
>
> ...-fix-cross-compilation-with-gdlib.pc.patch | 34 +++++++++++++++++++
> package/perl-gd/perl-gd.mk | 6 +++-
> 2 files changed, 39 insertions(+), 1 deletion(-)
> create mode 100644 package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
>
> diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
> new file mode 100644
> index 0000000000..af053c5605
> --- /dev/null
> +++ b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch
> @@ -0,0 +1,34 @@
> +From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 24 Jan 2021 10:59:31 +0100
> +Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc
> +
> +Cross-compilation will fail if gdlib.pc does not contain any cflags.
> +Indeed, if cflags is empty, Makefile.PL will use the default value for
> +INC (i.e. -I/usr/include -I/usr/include/gd)
> +
> +It should be noted that gdlib-config has been dropped from gd since
> +version 2.3.0
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: probably not upstreamable]
> +---
> + Makefile.PL | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.PL b/Makefile.PL
> +index 25f2f93..7da3651 100644
> +--- a/Makefile.PL
> ++++ b/Makefile.PL
> +@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option -
> + END
> + }
> +
> +- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC;
> ++#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC;
I'm not altogether happy with this patch, but I didn't really find a better way.
Actually I'd say that this could be upstreamable, in a way. I mean, it's
definitely wrong for cross-compilation, and it should never be needed since the
required flags should come from either pkg-config or gd-config.
> + @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
This one should be removed as well, really. It's just OK for us because the .pc
file happens to add an -L flag.
Anyway, applied to master, thanks.
Regards,
Arnout
> + @LIBS = qw(-lgd) unless @LIBS;
> +
> +--
> +2.29.2
> +
> diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
> index b058672a23..2932b686bb 100644
> --- a/package/perl-gd/perl-gd.mk
> +++ b/package/perl-gd/perl-gd.mk
> @@ -7,11 +7,15 @@
> PERL_GD_VERSION = 2.73
> PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
> PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
> -PERL_GD_DEPENDENCIES = host-pkgconf zlib libpng freetype gd
> +PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib libpng freetype gd
> PERL_GD_LICENSE = Artistic or GPL-1.0+
> PERL_GD_LICENSE_FILES = LICENSE
> PERL_GD_DISTNAME = GD
>
> +PERL_GD_CONF_ENV = \
> + PATH=$(BR_PATH) \
> + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
> +
> PERL_GD_CONF_OPTS = \
> -lib_gd_path=$(STAGING_DIR)/usr \
> -lib_ft_path=$(STAGING_DIR)/usr \
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options
2021-02-12 6:39 ` [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options Fabrice Fontaine
2021-02-12 12:02 ` François Perrad
@ 2021-02-16 20:51 ` Arnout Vandecappelle
1 sibling, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2021-02-16 20:51 UTC (permalink / raw)
To: buildroot
On 12/02/2021 07:39, Fabrice Fontaine wrote:
> Now that gdlib-config is gone, provide the GD options otherwise perl-gd
> will assume that everything is available:
>
> $features = 'GD_GIF GD_GIFANIM GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE GD_FONTCONFIG GD_JPEG GD_XPM GD_TIFF GD_WEBP';
>
> Also, while at it, also make some of the dependencies as optional as
> suggested by Fran?ois Perrad
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Arnout
[snip]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-16 20:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-12 6:39 [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package Fabrice Fontaine
2021-02-12 6:39 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig Fabrice Fontaine
2021-02-12 12:01 ` François Perrad
2021-02-16 20:50 ` Arnout Vandecappelle
2021-02-12 6:39 ` [Buildroot] [PATCH v2,3/3] package/perl-gd: provide gd options Fabrice Fontaine
2021-02-12 12:02 ` François Perrad
2021-02-16 20:51 ` Arnout Vandecappelle
2021-02-12 12:01 ` [Buildroot] [PATCH v2, 1/3] package/perl-extutils-pkgconfig: new package François Perrad
2021-02-16 20:35 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.