From patchwork Fri Jul 31 08:07:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1339298 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; dmarc=fail (p=none dis=none) header.from=gmail.com 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=LgxGvGse; 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 4BJ0JG4Wvxz9sTH for ; Fri, 31 Jul 2020 18:07:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C040420378; Fri, 31 Jul 2020 08:07:38 +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 Wkjt+vZ8M-Vl; Fri, 31 Jul 2020 08:07:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 59D8F203D3; Fri, 31 Jul 2020 08:07:37 +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 C21C01BF2CA for ; Fri, 31 Jul 2020 08:07:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AD07220378 for ; Fri, 31 Jul 2020 08:07:35 +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 EGE39I9qOYvq for ; Fri, 31 Jul 2020 08:07:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by silver.osuosl.org (Postfix) with ESMTPS id 770F8203D3 for ; Fri, 31 Jul 2020 08:07:34 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id x5so7799990wmi.2 for ; Fri, 31 Jul 2020 01:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IQY5ZA3L6oYVgnUNY50NFmtkxBpeHA/mvaHpjTK2EaQ=; b=LgxGvGse7x3Sd1T2osAgcBXwd7xvEn0sQ5eXf/OciAdLDV2X15eObPxnhkyU/LnUjU gmG0wZ4VYFT3uInMJ148adxiRFbDoTc5KQ7N3QWLwUiq4AkuQ8O29G3tTN22+KsD5cnK M15b8lG4+C8xz48NEKQxfnQhF18ar4UaS3d9TZCluV5Y8XCV2HxC+0qknCUADMi8Wr85 AtEYRKUamJbe0U+dByt6LJZpTuOdRbJyk6BjmW81ccynHzXylYS3755ZLnkIPnvB78XS r6wWgalX2RLJWTOxWp0V8Ia3IaugRnB+96yzuKo2BafC2U6dfVqADWtGEk/RpCtb+3DG T3gQ== 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:mime-version :content-transfer-encoding; bh=IQY5ZA3L6oYVgnUNY50NFmtkxBpeHA/mvaHpjTK2EaQ=; b=AMwLmxh+SACSAdsiITYK9i9rwzpGkRPyt6spddEXk6ox+OEahIKPhggdMTJBbVOo1W lrNnxiD37WxnfIyndixX1D7C8gnb57qbJ0CQ6M3KI92296Zg2be894324kwyoH+WPGJq 6ivOevb+fcTVGs0G3LKbRzrdFg9XCCSFDgkJjZKpWdAkeABjnUlY4Gz8mr8S3sH9xbAR jfUEIfH2ML1770sox+3tPOBbszxzl3a88jWsWd5F8KpUYOxfLuPTq72letdlO9IRMpDP cmhOEnReJpYUyAod4otvmJX5FAxU/Y05HYbpCSBmHRFBKIPm827xgUN19pM0qjZChsQE dysg== X-Gm-Message-State: AOAM532n6qd9wQM5KXqaiTahTQfHO3wARdbJHDQl7diN2AYTxfX09V54 V4iZHUeZj5wLd/tPGZelplFs3d8j X-Google-Smtp-Source: ABdhPJzrEKwbRnQbRy8d+uc/8hrhtoP5hrZZLRGussCI8SRRCFVb+zZRYUVUe4c6gR82HrWj9xeYJg== X-Received: by 2002:a1c:7311:: with SMTP id d17mr2753381wmb.60.1596182852406; Fri, 31 Jul 2020 01:07:32 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id z7sm11164155wmk.6.2020.07.31.01.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 01:07:31 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 31 Jul 2020 10:07:15 +0200 Message-Id: <20200731080715.150745-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/nginx: drop gdlib-config 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: Samuel Martin , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop gdlib-config and use pkg-config to find gd. Indeed, gdlib.pc is available since version 2.1.0 and https://github.com/libgd/libgd/commit/071a2a94ee9f9e5ce00ff689dfe67a0fcb885ad6 and gdlib-config has been dropped from version 2.3.0 Signed-off-by: Fabrice Fontaine --- .../nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch | 9 ++++++--- package/nginx/nginx.mk | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch index cea68035e1..31ccf88fff 100644 --- a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch +++ b/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch @@ -9,6 +9,8 @@ dependencies. Signed-off-by: Martin Bark [Peter: updated for 1.15.6] Signed-off-by: Peter Korsgaard +[Fabrice: use pkg-config instead of gdlib-config] +Signed-off-by: Fabrice Fontaine --- auto/lib/libgd/conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -17,14 +19,15 @@ diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf index 67863976..1a4379a5 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf -@@ -7,8 +7,8 @@ +@@ -7,8 +7,9 @@ ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs="-lgd" -+ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" -+ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" ++ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I gdlib| ++ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" ++ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs gdlib)" ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); (void) img" . auto/feature diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index d23c2fd4fa..1f896bc377 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -290,7 +290,6 @@ NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR define NGINX_CONFIGURE_CMDS cd $(@D) ; $(NGINX_CONF_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \ ./configure $(NGINX_CONF_OPTS) \ --with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)" endef