From patchwork Sun Jan 24 11:22:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1430895 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=XnYXqO7f; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DNrGH2tXwz9sVw for ; Sun, 24 Jan 2021 22:23:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3BBBE872A0; Sun, 24 Jan 2021 11:23:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kkqwGV5+7TeW; Sun, 24 Jan 2021 11:23:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E45F87299; Sun, 24 Jan 2021 11:23:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 280C21BF429 for ; Sun, 24 Jan 2021 11:23:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 16E4E86AC2 for ; Sun, 24 Jan 2021 11:23:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zd8uPkDY858k for ; Sun, 24 Jan 2021 11:23:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id E4DD886A77 for ; Sun, 24 Jan 2021 11:23:09 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id 7so9409391wrz.0 for ; Sun, 24 Jan 2021 03:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XxJvHOQ0Ygu1EC6Nttm0XbKcxL2JSx3GZj9Z4HaOp3A=; b=XnYXqO7fZM7Fkb+Skk2oykrg08rJd0wcjfudSPluUHeqp7u7m1CU7DU9QHRVgUcBiC 2iIzylGaWkGOpYInbb5VokYZbCikP4FfUkCVZPEMYlAEeCbY51ZE0sD0ZR2PwG3QBMLo pEMlG/qdyxDC+6kdYq8tbj+SEI3DewGZ+r7A6BCgael2a2R4nnYDxgpboHkFYndOcNxn LcI4Lm0B0nTGeq10Fe90B0tuTjHapbFjbuclsePY4wrgmojoWbFqswD7l4KQH6Nr9drf mQIlw8WL3MXbI83YZauxHc+kWJHtplWVc55TSUXVjqyIX+4haRadkyMKDha+FIks5aJp 5jzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XxJvHOQ0Ygu1EC6Nttm0XbKcxL2JSx3GZj9Z4HaOp3A=; b=haLK/dtegtZ8X1cRt/chP4ZXVNaIB2lRZUvNmhy+bdu/jJp3+BZNBEu3bmBC31lELf DvzXAzwNeTlgzXVR9QyEbmo68h4iTUVgGg3Vn3HYEnwJnCej57UGHMtDiDd1KS7KAbQI BjVZJrEONmg5Ia2k8mIncS0AvDB1O280BEJxxdHmANBNSVF0ztU5+s9KR+bL4V4jl3z/ /GEUnpRnFdw8lA67IZbTy0X1OAJqCfxpLao9myMKk2J5FcT1Da89YYrCYb9Wq3/jZ94A dqfnww6y8ZlFns+JTtp61QzaCDBK0voZj2qZnBwDXumJfPYEwD4Kxf4bDZOMkpG0LVjz nO/w== X-Gm-Message-State: AOAM532YJ6MhoslF6tLQG9B/5lMMyjJW4rxAu8m8h9nB0dh0DlB1RdES 3Y8+jcQVmbBuV/GDqaABc49kZxnKkyg= X-Google-Smtp-Source: ABdhPJxaIXV5Fx/ySM5qxxhj/Anuyw3IhnZFsyHH7/Bf3MOfVGTb+dWf4zqt5yMdLs3P9WDhFRXlyg== X-Received: by 2002:a05:6000:104f:: with SMTP id c15mr557400wrx.239.1611487388169; Sun, 24 Jan 2021 03:23:08 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id i131sm16989069wmi.25.2021.01.24.03.23.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 03:23:07 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 24 Jan 2021 12:22:13 +0100 Message-Id: <20210124112214.480254-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210124112214.480254-1-fontaine.fabrice@gmail.com> References: <20210124112214.480254-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/perl-gd: needs perl-extutils-pkgconfig X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit 3a291be2e89bc64388c10dae50233c751a86733d forgot to add perl-extutils-pkgconfig dependency Fixes: - http://autobuild.buildroot.org/results/e590f1990180eae21512b23b884755e105a4c588 Signed-off-by: Fabrice Fontaine --- ...-fix-cross-compilation-with-gdlib.pc.patch | 34 +++++++++++++++++++ package/perl-gd/perl-gd.mk | 7 +++- 2 files changed, 40 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 +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 +[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 + } + +-@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..1471cfb8bf 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -7,11 +7,16 @@ 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-pkgconf 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 \