From patchwork Sun Jul 28 06:10:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1137924 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="errYm9ku"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45xC9h3vW0z9s7T for ; Sun, 28 Jul 2019 16:10:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7269487060; Sun, 28 Jul 2019 06:10:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5bCX_clU8w71; Sun, 28 Jul 2019 06:10:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EB9B287009; Sun, 28 Jul 2019 06:10:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E25BE1BF46A for ; Sun, 28 Jul 2019 06:10:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DED6E889D0 for ; Sun, 28 Jul 2019 06:10:41 +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 xW1pzJuV0rva for ; Sun, 28 Jul 2019 06:10:39 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7D1F6889D1 for ; Sun, 28 Jul 2019 06:10:39 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A2305240101 for ; Sun, 28 Jul 2019 08:10:36 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45xC9Q5q0yz9rxD; Sun, 28 Jul 2019 08:10:34 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1564294233; x=1564899034; bh=1iCJj9v/+tF45ErfNQT8L/33Dk3uXm0diVs 3Fmvr5Bw=; b=errYm9ku5/iLAUeIMG0rDw/mIzfYFs2GEVyatibSO3lSgefBVwj nEnRsnanEmOziHXh66LOpouVFydTBB5OORA0069pcj20FWT8wus3HljAYgGoBidA +WkrHa7N1McmwKKD5o08ZQkcLAO5AX4mUAgGqkzTG/o7b/NXRG8NPptn+4s2p+Nq jHOeaIyQ0Fup5cY1lJh/YLHr5w7Ej7/pfKCyfNNrlWRlwHZhYpzGWnifE2j5AQMr leBEztjxsUy8qbgdMMl+k0fjHISlxZDSCZlkOYURJTqGfQrsU9WHlJXmTvOiLLbx GBR6z02Q+y5IPh9GMNEXAN74+NCCjipBN7Q== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ktRa9b_MFLXL; Sun, 28 Jul 2019 08:10:33 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-79-126.dynamic.qsc.de [92.195.79.126]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Sun, 28 Jul 2019 08:10:33 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Sun, 28 Jul 2019 08:10:21 +0200 Message-Id: <20190728061023.5283-2-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190728061023.5283-1-joerg.krause@embedded.rocks> References: <20190728061023.5283-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 1/3] package/libgcrypt: replace reconfigure patch with upstream patch 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: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The `ac_cv_sys_symbol_underscore` reconfigure patch was added to Buildroot back in 2007 [1], but was not reported to upstream back then. Meanwhile, the issue has been fixed upstream [2] after the version bump to version 1.8.4. In order to add another upstream patch, which will add a pkg-config file for libgrypt and therefore requires autoreconfiguration as well, replace the current patch with the upstream patch. [1] https://git.buildroot.net/buildroot/commit/package/libgcrypt?id=f1bcdf518fa7868b7819b0248f4b8da02a954dde [2] https://github.com/gpg/libgcrypt/commit/0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad Signed-off-by: Jörg Krause --- v4: * none v3: * initial commit --- ...ult-to-underscore-yes-for-cross-buil.patch | 48 +++++++++++++++++++ package/libgcrypt/0001-reconfigure.patch | 27 ----------- package/libgcrypt/libgcrypt.mk | 4 +- 3 files changed, 50 insertions(+), 29 deletions(-) create mode 100644 package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch delete mode 100644 package/libgcrypt/0001-reconfigure.patch diff --git a/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch b/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch new file mode 100644 index 0000000000..032cb7c84c --- /dev/null +++ b/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch @@ -0,0 +1,48 @@ +From 7fec3ac22efb86fce90a9edc5696e16ee88a65c7 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Wed, 24 Oct 2018 14:29:45 +0900 +Subject: [PATCH] build: Don't default to underscore=yes for cross-build. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* acinclude.m4: Don't set ac_cv_sys_symbol_underscore +for cross build. + +-- + +It made sense in the past when cross compile were basically for a.out +system, but nowadays, it's better not to assume that. + +Fetched from: 0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad + +Signed-off-by: NIIBE Yutaka +Signed-off-by: Jörg Krause +--- + acinclude.m4 | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index fc208c53..6f7789d0 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -111,14 +111,10 @@ case "${host}" in + ac_cv_sys_symbol_underscore=yes + ;; + *) +- if test "$cross_compiling" = yes; then +- if test "x$ac_cv_sys_symbol_underscore" = x ; then +- ac_cv_sys_symbol_underscore=yes +- fi +- else ++ if test "$cross_compiling" != yes; then + tmp_do_check="yes" + fi +- ;; ++ ;; + esac + if test "$tmp_do_check" = "yes"; then + AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) +-- +2.22.0 + diff --git a/package/libgcrypt/0001-reconfigure.patch b/package/libgcrypt/0001-reconfigure.patch deleted file mode 100644 index 87d29a298b..0000000000 --- a/package/libgcrypt/0001-reconfigure.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure b/configure -index 70a6d50..8f55d95 100755 ---- a/configure -+++ b/configure -@@ -22306,14 +22306,15 @@ case "${host}" in - i386-emx-os2 | i345686-pc-os2*emx | i386-pc-msdosdjgpp) - ac_cv_sys_symbol_underscore=yes - ;; -- *) -- if test "$cross_compiling" = yes; then -- if test "x$ac_cv_sys_symbol_underscore" = x ; then -- ac_cv_sys_symbol_underscore=yes -+ *)if test -z "$ac_cv_sys_symbol_underscore";then -+ if test "$cross_compiling" = yes; then -+ if test "x$ac_cv_sys_symbol_underscore" = x ; then -+ ac_cv_sys_symbol_underscore=yes -+ fi -+ else -+ tmp_do_check="yes" -+ fi - fi -- else -- tmp_do_check="yes" -- fi - ;; - esac - if test "$tmp_do_check" = "yes"; then diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 452cf17ce1..5aa44481ae 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -13,8 +13,8 @@ LIBGCRYPT_INSTALL_STAGING = YES LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config -LIBGCRYPT_CONF_ENV = \ - ac_cv_sys_symbol_underscore=no +# Patching acinclude.m4 in 0001 +LIBGCRYPT_AUTORECONF = YES LIBGCRYPT_CONF_OPTS = \ --with-gpg-error-prefix=$(STAGING_DIR)/usr