From patchwork Sun Jan 24 11:22:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1430896 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.136; helo=silver.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=l3mWZTVH; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DNrGH73vJz9sWD for ; Sun, 24 Jan 2021 22:23:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ACE49272E3; Sun, 24 Jan 2021 11:23:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gkf1tZC-AYg7; Sun, 24 Jan 2021 11:23:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B7258203D9; Sun, 24 Jan 2021 11:23:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 367421BF954 for ; Sun, 24 Jan 2021 11:23:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2FC58203D9 for ; Sun, 24 Jan 2021 11:23:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7ZU6xYsPNc1y for ; Sun, 24 Jan 2021 11:23:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by silver.osuosl.org (Postfix) with ESMTPS id 5E7312010C for ; Sun, 24 Jan 2021 11:23:11 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id m1so8710465wrq.12 for ; Sun, 24 Jan 2021 03:23:11 -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=y0o+hQQdfJrhWQ/H0pYjB9UlU2zEDYI+ruqePPVh6gE=; b=l3mWZTVHHiSNkMnLMmXJ4GYfO0NwrNUyvDWWf8bMyc/48sVx6ycnK2aC8OI0KlRRDT qIdirKE4RboClnxCk6lq6WXkv31Ce2pC9cG1kXOqWopg1mieDuyP17Q++i3K8LCleC2q bHFVBReYgUyEg0Ny4G7Mo0o9DH7NwLu8CNUE0dNatm0vHSuRxvE3pNeYZwO3njeM4e++ LiK4cVQxDrnAKVlk6Q6rhQdN1yOx5KeFkxbHeAvnU261QgyxVHS4iioeE+7L7125sGWs etmS0RWeTdj7ynVb36w5jal6N9UWqoFBiJ4p1j+pn9EHiek9PbuqE9wLrRUTsq8wFgj/ 7NWA== 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=y0o+hQQdfJrhWQ/H0pYjB9UlU2zEDYI+ruqePPVh6gE=; b=lrwDJ99pBL3fm4YTrKRsbrwHOFnA2npgAqqCxJNUo6iEyZjslhXlofUajLH8OomFp3 SnctFR9YQYFtjO667DQXytjgYB04WQlZZMJEHlG+FSUndf+9tIkP9YvwAgfQaE8WBOVy jqr0ONLB7ur6JirHeRhV3rPOI8ygCwBnK74ThyvEH0VSQ3UiiX7cfQF687QQJXIGFsF8 +S2vxZn/BoOmTWHjNpAaHZ/vMKIArzZ2ZAG3EKPlKBv0fX0CVHDMdJVnZT9CwH8SUxKI SG55kbUIOnoHCZF31zFTXOuQW1tqt8z0j5XoLJuHTBQ3Mp39KB8qGs3X6cTggYG7ikCK rO4A== X-Gm-Message-State: AOAM532s2YISS0XADoYmg4K94824sxufnQdJE+BISTFbhQHye7TQjjUX EgThs8PJKZcovP62oFjY25Iwfkch82w= X-Google-Smtp-Source: ABdhPJwq+yH+RfBTC7pfi0Bb5A0KNuPCgB7Su9JTW5MUX62j/8x1+oxNLi4mwjYns4X+TKjMDtH42w== X-Received: by 2002:a5d:4e89:: with SMTP id e9mr2077362wru.201.1611487389685; Sun, 24 Jan 2021 03:23:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 03:23:09 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 24 Jan 2021 12:22:14 +0100 Message-Id: <20210124112214.480254-3-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 3/3] package/perl-gd: provide gd options 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" 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'; Signed-off-by: Fabrice Fontaine --- package/perl-gd/perl-gd.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index 1471cfb8bf..6872fd1ce1 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -17,10 +17,31 @@ PERL_GD_CONF_ENV = \ PATH=$(BR_PATH) \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +PERL_GD_OPTIONS += FONTCONFIG +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +PERL_GD_OPTIONS += FT +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +PERL_GD_OPTIONS += JPEG +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +PERL_GD_OPTIONS += PNG +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +PERL_GD_OPTIONS += XPM +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))