From patchwork Mon Aug 31 19:22: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: 1354554 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=G5eCk+5Q; 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 4BgKqS6VS3z9sTK for ; Tue, 1 Sep 2020 05:23:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 00FF58685E; Mon, 31 Aug 2020 19:23:14 +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 9JB+WkWDYMJX; Mon, 31 Aug 2020 19:23:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0BEA18684E; Mon, 31 Aug 2020 19: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 A372C1BF300 for ; Mon, 31 Aug 2020 19:23:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 98E038684E for ; Mon, 31 Aug 2020 19:23:11 +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 NfAi1PGArQWw for ; Mon, 31 Aug 2020 19:23:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id F099A86688 for ; Mon, 31 Aug 2020 19:23:09 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id q9so563570wmj.2 for ; Mon, 31 Aug 2020 12:23:09 -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=MK+DO5fEh2W4QrOR3wHl0uaYseDIORrg0NwNcccx+XU=; b=G5eCk+5QngI8VpJ4WnXVxwVTq5ea/HrA4CAYXkN5Iz5svq4v4clINTwEARP0DSDBHQ AOPzsHndLmyTIRubLX3vWdHLIPumyGxDrMz9vcGzqSPhHqQbC5pG6Y1BX8O2282d4AIV pSRLOFVN7/eAh4VyfnGZGHNfnoUQdKw4FQdxvkepWnSaVd6fnpzOq3lPlHpW4ImbWdxY DsdTj7d6c93gi/yCcTdr+l1f4k9C2MYikx9+Qp71BW0fFmTEo7cUDZZZHnB/TQHAp447 4W4O7zTGLNiNLy+ZiU898YocqCIR3+BFu7w4zmFx16LPG+lO5NXp6JpZaDZjc+pJMbut S7Vg== 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=MK+DO5fEh2W4QrOR3wHl0uaYseDIORrg0NwNcccx+XU=; b=FShCHkxZbxPOAWUyEgYCL4WCH9KcZs0Pkwh8EUeIfVS2dU6xCi1DdeXqNjXCpMt9sc Ek4bqydLpojvyA8VvYbqR1WhKpI4SBmB81TMYQrjjdBJaiUx8V3mOejRk55ttMRULPbf oHGZE0FazYXgIII+zFRSMeNXFiGVkIu3CZk+/T7v4t5eZFCKF1sQXIISxd/NO1YIAmoh 0G2HOl4NgyoUdhFVQV06lyfI1IJVmeyVZqKUqSSWY2XJA09rzuXJNNelqFPE+yrQ2mNv i4n1NLkGrXsJR5uqgJHXBOtAbPY+vIqjXkvhgYtDqAJ3qQhhwU9N/O9L8hbhfA569UXN PfKA== X-Gm-Message-State: AOAM532vcln2UIWtFhwdnvwfLKKCM6V04X+p5/AJ51sBN3boNPiA5IR1 3N8nsMoqSSa3BvDkc4b0rATXdAR7svQ= X-Google-Smtp-Source: ABdhPJzTX2gKo+DMRnq0mbZIbEJ1Rx/dFzSjFmw31JT0UOZ4tiPvz1FlZzzcfiRnRoQRCrMFvM6FQg== X-Received: by 2002:a1c:6445:: with SMTP id y66mr820787wmb.12.1598901787898; Mon, 31 Aug 2020 12:23:07 -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 o16sm13154775wru.3.2020.08.31.12.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 12:23:07 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 31 Aug 2020 21:22:15 +0200 Message-Id: <20200831192215.1677034-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/graphite2: fix static install 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" Don't install an incorrect libtool file when building a static library to fix the following build failure with harfbuzz: arm-linux-g++.br_real: error: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgraphite2.so: No such file or directory make[5]: *** [main] Error 1 Fixes: - http://autobuild.buildroot.org/results/9ebe1d11e80755d59190ef2aae82bbba5cc45e44 Signed-off-by: Fabrice Fontaine --- ...l-a-libtool-file-with-static-library.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch diff --git a/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch b/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch new file mode 100644 index 0000000000..ac150622d5 --- /dev/null +++ b/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch @@ -0,0 +1,67 @@ +From 3edb88b55c0870989778c670d555aa159a2c3abc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 31 Aug 2020 20:56:43 +0200 +Subject: [PATCH] don't install a libtool file with static library + +Static library is supported since version 1.3.11 and +https://github.com/silnrsi/graphite/commit/2f143c04da5caa43ddf4dba437b2f2bc26bf4238 + +However, graphite2 is still installing libgraphite2.la which contains +incorrect information (i.e. dlname set to libgraphite2.so and +old_library set to ''): + +dlname='libgraphite2.so' + +library_names='libgraphite2.so.3.2.1 libgraphite2.so.3 libgraphite2.so' + +old_library='' + +dependency_libs='' + +This will result in the following build failure with any applications +using this file such as harfbuzz: + +arm-linux-g++.br_real: error: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgraphite2.so: No such file or directory +make[5]: *** [main] Error 1 + +Instead of trying to fix this libtool file, just disable it when +building a static library as it is not needed + +Fixes: + - http://autobuild.buildroot.org/results/9ebe1d11e80755d59190ef2aae82bbba5cc45e44 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/silnrsi/graphite/pull/65] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b6ac26bf..a7ace040 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -131,7 +131,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + nolib_test(stdc++ $) + endif () + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") +- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") ++ if (BUILD_SHARED_LIBS) ++ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") ++ endif() + endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +@@ -146,7 +148,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + include(Graphite) + nolib_test(stdc++ $) + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") +- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") ++ if (BUILD_SHARED_LIBS) ++ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") ++ endif() + endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") +-- +2.28.0 +