From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig
Date: Fri, 12 Feb 2021 07:39:43 +0100 [thread overview]
Message-ID: <20210212063944.2202888-2-fontaine.fabrice@gmail.com> (raw)
In-Reply-To: <20210212063944.2202888-1-fontaine.fabrice@gmail.com>
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
next prev parent reply other threads:[~2021-02-12 6:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2021-02-12 12:01 ` [Buildroot] [PATCH v2, 2/3] package/perl-gd: needs perl-extutils-pkgconfig 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210212063944.2202888-2-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.