From patchwork Mon Oct 5 17:14:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1376976 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.138; helo=whitealder.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=Ylf4UmGk; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C4vk02G6fz9sTf for ; Tue, 6 Oct 2020 09:03:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 573248610B; Mon, 5 Oct 2020 17:14:18 +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 7WjKSYspugZx; Mon, 5 Oct 2020 17:14:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E167986123; Mon, 5 Oct 2020 17:14:16 +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 B8DAB1BF2F2 for ; Mon, 5 Oct 2020 17:14:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B331486123 for ; Mon, 5 Oct 2020 17:14:15 +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 Pc4Ldta4aDLi for ; Mon, 5 Oct 2020 17:14:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9D4478610B for ; Mon, 5 Oct 2020 17:14:14 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id d3so281182wma.4 for ; Mon, 05 Oct 2020 10:14:14 -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=tHMkGxfJ62DclCl5adz8dGt4NvFWYRhsvoJo16VVAiU=; b=Ylf4UmGkD3fHTvOnn2ma7t9NRv3QoPJLSCH0o3i6Z+XgZz30CfYUh2LT4ufg37Zmjz HaaID8prNOiABmtuNreVQ48+J8eoamtSOtlPUICapCUBTJiottpKMNHscNYQujqfvXWs owHx3DSv2luP2Z6aCM6YO4LbIXiPakzJM0nktrnn5QNduMqo6i0Rok1ZoO5T4RblsPng Ali/nbhcIdbGa/vOWZAAhUYiaM37XIbvXiCdByOF25WbFqOs2StY3vhFmdiRDInfAE/7 xvi1R6EQOW+FaKA/HEjXeQV3BxRpYTawD7ed/caL+j9L3ZElwAKr0aPdXwBjht7QUx98 w0Sg== 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=tHMkGxfJ62DclCl5adz8dGt4NvFWYRhsvoJo16VVAiU=; b=TZ4ht3I9RcwTDUy4XXyzIopzO5sdj97YQZqzCaZRkjrPQ84H+KOFpshDl52ehJAJtR nOi+mgQVdNAbDSDz3ccZb+yYMEITsE1ArFs3BjVi0k2quP3bsfygBuwWr2MLXfeCm4iC lWM64Xh7fsUJFFSPgubS/8AM4jZs2y2CD7r11fJGsiv2IQktFPUfrjwlY0t9+j7eH4SX J9swLyCc3crlc1kl02+Dg3kKxoJ3GMS0zmNgdOFUhVJ2ywh2Z0B3H9+fRSbGpDys/zr5 p8RgAnlhsdXTML6FcUxPTyEgRR9ehR7dBAcgmdAb6NmYafwTm0iPFBYXXwBtvOFMlwQp ryig== X-Gm-Message-State: AOAM532mOGh7iY2gGUcxRH1IIMRLcsi2o9NiP6ltn2j6ERMQFet/gVzk PlZXL+PUCG83focSbqKQbaysRYhQYg5g2g== X-Google-Smtp-Source: ABdhPJxKm8Zus5Wra/I8aYm+qVv8xvIqcb28vLfzEeA+AHxX/6YmolxQctwCMcdtMDpHio+RU8oVzw== X-Received: by 2002:a1c:bdc4:: with SMTP id n187mr363619wmf.185.1601918052505; Mon, 05 Oct 2020 10:14:12 -0700 (PDT) Received: from kali.home (2a01cb0881b76d0062c55ff6bf2a37aa.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:62c5:5ff6:bf2a:37aa]) by smtp.gmail.com with ESMTPSA id i15sm792526wrb.91.2020.10.05.10.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 10:14:10 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 5 Oct 2020 19:14:07 +0200 Message-Id: <20201005171407.2608421-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/brotli: fix pkg-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: Adrian Perez de Castro , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" brotli pkg-config files are broken since version 1.0.8 and https://github.com/google/brotli/commit/31754d4ffce14153b5c2addf7a11019ec23f51c1 This raise static build failures with all packages using brotli, fontconfig or freetype such as fbterm: -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -static -o fbterm fbterm-fbconfig.o fbterm-fbio.o fbterm-fbshell.o fbterm-fbshellman.o fbterm-fbterm.o fbterm-font.o fbterm-input.o fbterm-mouse.o fbterm-screen.o fbterm-improxy.o fbterm-screen_render.o fbterm-fbdev.o fbterm-vesadev.o lib/libshell.a -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lfreetype -lbz2 -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lz -lpng16 -lz -R/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lbrotlidec -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -R/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buil droot-linux-uclibcgnueabihf/sysroot/usr/lib -lbrotlicommon -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lfontconfig -lfreetype -lbz2 -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lz -lpng16 -lz -R/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lbrotlidec -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -R/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -lbrotlicommon -L/srv/storage/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib -luuid -lexpat -lutil -lutil arm-linux-g++.br_real: error: unrecognized command line option '-R' Fixes: - http://autobuild.buildroot.org/results/21ede59686d4998c9e643ea874396a11b1c0df93 Signed-off-by: Fabrice Fontaine --- ...time-linker-path-to-pkg-config-files.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch diff --git a/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch b/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch new file mode 100644 index 0000000000..892aa1da15 --- /dev/null +++ b/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch @@ -0,0 +1,51 @@ +From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001 +From: Eugene Kliuchnikov +Date: Wed, 2 Sep 2020 11:38:26 +0200 +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)" + (#838) + +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1. +[Retrieved from: +https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc] +Signed-off-by: Fabrice Fontaine +--- + scripts/libbrotlicommon.pc.in | 2 +- + scripts/libbrotlidec.pc.in | 2 +- + scripts/libbrotlienc.pc.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in +index 10ca969e..2a8cf7a3 100644 +--- a/scripts/libbrotlicommon.pc.in ++++ b/scripts/libbrotlicommon.pc.in +@@ -7,5 +7,5 @@ Name: libbrotlicommon + URL: https://github.com/google/brotli + Description: Brotli common dictionary library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlicommon ++Libs: -L${libdir} -lbrotlicommon + Cflags: -I${includedir} +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in +index e7c3124f..6f8ef2e4 100644 +--- a/scripts/libbrotlidec.pc.in ++++ b/scripts/libbrotlidec.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlidec + URL: https://github.com/google/brotli + Description: Brotli decoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlidec ++Libs: -L${libdir} -lbrotlidec + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in +index 4dd0811b..2098afe2 100644 +--- a/scripts/libbrotlienc.pc.in ++++ b/scripts/libbrotlienc.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlienc + URL: https://github.com/google/brotli + Description: Brotli encoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlienc ++Libs: -L${libdir} -lbrotlienc + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir}