From patchwork Fri Jul 26 09:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1965224 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WVj0l4Cvxz1yY5 for ; Fri, 26 Jul 2024 19:20:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2BA6D80CEA; Fri, 26 Jul 2024 09:20:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Y5ScFPZ78luK; Fri, 26 Jul 2024 09:20:50 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E818680C64 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id E818680C64; Fri, 26 Jul 2024 09:20:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B1CF91BF20B for ; Fri, 26 Jul 2024 09:20:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AB10E80C44 for ; Fri, 26 Jul 2024 09:20:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id iFUxN6-euWyB for ; Fri, 26 Jul 2024 09:20:47 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::329; helo=mail-wm1-x329.google.com; envelope-from=fontaine.fabrice@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 8046080C19 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8046080C19 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8046080C19 for ; Fri, 26 Jul 2024 09:20:47 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4279c10a40eso13197865e9.3 for ; Fri, 26 Jul 2024 02:20:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721985645; x=1722590445; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HVw6ywiQSVIhKePQKSU2lz4tFIxyK/IHr6/u5OMH4I4=; b=U7e1N1ieQBNhks+JuQQ0cHOSWEtdNKgr15PezY3bGEhuuKFHg1kRaOz0rHzVsv/RW0 OmKS67VYRSzNFucwt00DYfHkaToo96MMNOunsKsK08DVIbP6pNYLnAY3zE/7WkOJuHjx 9THn8x18pBg8xYMWGYmWZhjzzAuavUQMK5hES3dvCE0APy1mF+i1aE3ZJD4hLf5quwEz 1jyZu8pyL30Iieith+m27jxAQHzo9NlXcxTCGCFmyUOfH9FWCfWq1SeT7NkVVKe1oVpW XXd5KaaPeUx1fnCI0lUhr2ij6VmXQhWCcWIgtqZ/JbI9STlt0+t7Q337W9Vjau84bYp6 FgAA== X-Gm-Message-State: AOJu0Yx8BIF/pZf3AcrR3w7GoW3Ew4q/0aGIxdgQxNTYYCruM93o/AG0 62u1JEeF6YL9EOxjiXcpH6IBSSkmN6DOkqhDHIhnYlZIysm4LeurrxER/A== X-Google-Smtp-Source: AGHT+IGjeLZ37t/eDoTRyjt5SWl4FKLFc/concnscMjzI/fB8c8cAEm13oZ+OtZ1MpK0IuvL5bODKQ== X-Received: by 2002:a05:600c:3b21:b0:424:ad14:6b79 with SMTP id 5b1f17b1804b1-42806b5c0b8mr32537815e9.8.1721985644994; Fri, 26 Jul 2024 02:20:44 -0700 (PDT) Received: from kali.home (lfbn-ren-1-785-215.w83-197.abo.wanadoo.fr. [83.197.112.215]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f938d9besm108352815e9.24.2024.07.26.02.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jul 2024 02:20:44 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 26 Jul 2024 11:20:42 +0200 Message-ID: <20240726092042.1273023-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721985645; x=1722590445; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HVw6ywiQSVIhKePQKSU2lz4tFIxyK/IHr6/u5OMH4I4=; b=EiVCPBTvxKEOVpMeAIMoqJLD747B01vJ7yCjTnhqmj7ck08bi8NxtAZO/WzUzjvdlM J07EzJY17YUL0X8i6SEllMy+AdOANhyBTPCCWwyUR5eEnbL+Z911l/OtkPoBo+giEQ+T oRytV7iCrciK8Cbra/fBGqNycGdpgJrrSHDDkDPZuLAfRV+8PXBSeE0lmin7psnfjbbw o7zIf6PP0iKBLdDr7SGXZHo475GkPQZsOQrIPdket9hN+wtmxrFdKpUT3EdA2BAWTSr3 qxWZFgHIb6Q4LB1TsrE4Lu7Xm8TZzLGdRoGRcWNSHQL/N2mcujhAOUANAbJ/ajaPS0qq Wo1Q== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=EiVCPBTv Subject: [Buildroot] [PATCH 1/1] package/lrzsz: bump to latest git commit X-BeenThere: buildroot@buildroot.org 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@buildroot.org Sender: "buildroot" - Switch to github to get latest code - LRZSZ_POST_EXTRACT_HOOKS must be added to remove wrong links on /usr/share/automake-1.16/config.{guess,sub} which were added by https://github.com/UweOhse/lrzsz/commit/f02af40d15bade4c07e057f4b3baccd341b692b6 - timesync dropped by https://github.com/UweOhse/lrzsz/commit/6322e4944c11373eeadc346e838351874b7d799f - This bump will also fix the following build failure with gcc >= 14: configure:1011:1: error: return type defaults to 'int' [-Wimplicit-int] 1011 | main(){return(0);} | ^~~~ [...] configure: error: installation or configuration problem: C compiler cannot create executables. Fixes: - http://autobuild.buildroot.org/results/076db37c936786291028b770ef2f83cd39f87ef3 Signed-off-by: Fabrice Fontaine --- ...-lib-long-options-c-include-stdlib-h.patch | 41 +++++++++++++++++++ .../0002-configure.ac-check-locale.h.patch | 31 ++++++++++++++ package/lrzsz/lrzsz.hash | 2 +- package/lrzsz/lrzsz.mk | 13 ++++-- 4 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 package/lrzsz/0001-lib-long-options-c-include-stdlib-h.patch create mode 100644 package/lrzsz/0002-configure.ac-check-locale.h.patch diff --git a/package/lrzsz/0001-lib-long-options-c-include-stdlib-h.patch b/package/lrzsz/0001-lib-long-options-c-include-stdlib-h.patch new file mode 100644 index 0000000000..61d8b2fc6d --- /dev/null +++ b/package/lrzsz/0001-lib-long-options-c-include-stdlib-h.patch @@ -0,0 +1,41 @@ +From 835071aa51203a0c6dfa4d950319f4c51589aad8 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Tue, 21 May 2024 11:13:17 +0200 +Subject: [PATCH] lib/long-options.c: include stdlib.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes the following error (compiled with GCC 14.x): + +long-options.c:70:11: error: implicit declaration of function ‘exit’ +[-Wimplicit-function-declaration] + 70 | exit (0); + | ^~~~ + +Upstream: https://github.com/UweOhse/lrzsz/pull/4 +Signed-off-by: Fabrice Fontaine +--- + lib/long-options.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/lib/long-options.c b/lib/long-options.c +index fe069fd..9553a31 100644 +--- a/lib/long-options.c ++++ b/lib/long-options.c +@@ -22,6 +22,15 @@ + #endif + + #include ++ ++/* This needs to come after some library #include ++ to get __GNU_LIBRARY__ defined. */ ++#ifdef __GNU_LIBRARY__ ++/* Don't include stdlib.h for non-GNU C libraries because some of them ++ contain conflicting prototypes for getopt. */ ++#include ++#endif /* GNU C library. */ ++ + #include + #include "long-options.h" + diff --git a/package/lrzsz/0002-configure.ac-check-locale.h.patch b/package/lrzsz/0002-configure.ac-check-locale.h.patch new file mode 100644 index 0000000000..792f204994 --- /dev/null +++ b/package/lrzsz/0002-configure.ac-check-locale.h.patch @@ -0,0 +1,31 @@ +From 5775f66ae3bbe8a481d1dadc9580fff3f94b0c01 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 25 Jul 2024 11:05:58 +0200 +Subject: [PATCH] configure.ac: check locale.h + +Check locale.h to avoid a build failure with NLS + +Fix #1 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/UweOhse/lrzsz/pull/6 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6895c30..c42bfe0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,7 +101,7 @@ AC_CHECK_LIB(intl,gettext,,,) + dnl Checks for header files. + AC_HEADER_STDC + AC_HEADER_MAJOR +-AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h sys/times.h) ++AC_CHECK_HEADERS(fcntl.h limits.h locale.h sys/ioctl.h sys/time.h unistd.h sys/times.h) + LRZSZ_HEADERS_TERM_IO + AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h) + AC_CHECK_HEADERS(sys/select.h strings.h) +-- +2.43.0 + diff --git a/package/lrzsz/lrzsz.hash b/package/lrzsz/lrzsz.hash index cd8dd6f489..dd48c450f7 100644 --- a/package/lrzsz/lrzsz.hash +++ b/package/lrzsz/lrzsz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 lrzsz-0.12.20.tar.gz +sha256 56f79c3eb8f6b140693667802d516824c2e115a83d15e1b4d5adbe1deab7c2e0 lrzsz-8cb2a6a29f6345f84d5e8248e2d3376166ab844f.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 7247a4bd59..75ab812f0a 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -4,14 +4,21 @@ # ################################################################################ -LRZSZ_VERSION = 0.12.20 -LRZSZ_SITE = http://www.ohse.de/uwe/releases -LRZSZ_CONF_OPTS = --disable-timesync +LRZSZ_VERSION = 8cb2a6a29f6345f84d5e8248e2d3376166ab844f +LRZSZ_SITE = $(call github,UweOhse,lrzsz,$(LRZSZ_VERSION)) LRZSZ_LICENSE = GPL-2.0+ LRZSZ_LICENSE_FILES = COPYING LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +# From git +LRZSZ_AUTORECONF = YES + +# Remove links on /usr/share/automake-1.16/config.{guess,sub} +define LRZSZ_REMOVE_WRONG_LINKS + $(RM) $(@D)/build-aux/config.{guess,sub} +endef +LRZSZ_POST_EXTRACT_HOOKS += LRZSZ_REMOVE_WRONG_LINKS define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz