From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B91704C9ED for ; Fri, 24 Jan 2025 21:40:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD8B868B68D; Fri, 24 Jan 2025 23:40:50 +0200 (EET) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A67068B275 for ; Fri, 24 Jan 2025 23:40:44 +0200 (EET) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-303548a9361so20664581fa.0 for ; Fri, 24 Jan 2025 13:40:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1737754843; x=1738359643; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=J5fcLcAZthFdN2osRM/0hdoaflrYwKjzVEwd9M8OlAQ=; b=KUrJPwR5dg2Prl5aVhM02WyI5fZHt19Kq6gfxZi1q7lbW0sP1egkDP1ybaC/nbPuC9 7kTV2DyZp34yp78PwleerGSJvnT5RlKnr50l8X9pruC5PVeN+OSsu+Oy66yXh1xqep5m LE0u/A3izxTPJinl13q5wcJBuIfjE0G7rPsPvDBzt5dVhjMSI7r9keoEm50q65XPzPl9 MH/6HLT9SM0WoeeN379QKfe52K908dW6uWmYswa4eE4uxn7iOwPcHd9Iyj5tNpKgYAKi 1eLmaRVgcNTqfPOgnV0g3TYDV4Nx9VFD3RHimpuh6rj3k+5zjgIE1ZUR2htLNQjOC3BP ZCjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737754843; x=1738359643; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J5fcLcAZthFdN2osRM/0hdoaflrYwKjzVEwd9M8OlAQ=; b=THW/BYKaEReII+Fo8drcjLb7j/Q1pJVcFfg6DFHSbH+lStyenkf3a57A5oGP8wcZ6E YWSYjH6/kSkC+8tHlDFxQqR4cNBu4wy34iNnteacPlP2QYdGh78eCjcMqbFHQp3cmGnd IT8lJUaGguLtjEsdcY4wIr3JoB/yoaDLNkuSubb+HZ/G8UW/pzgd2gbBeLhZk4OZYRm8 yIIfcqlmGlkflsTo7WU/L5u0SbYvdEuHjJ5zwEAN9sru0MOo/MU+9YEtiDyw1cpTIcag iJgfersuXf85rCSgL5pL3kXqkTFu8GiEy5ttcAmLSXXFH+oGGbHXUvvHMTSdsS2EVIx7 ZczQ== X-Gm-Message-State: AOJu0YxT4JupDnrlxlF9ok0XWx1nVMmW7s86YtN1WiEBvV+dKz5Ir/Sg kiDBzcI2iu1ZhMR4n5kLqDcj2NjEKnBDv5L/BUFIKLPF64ar8DuWyPyOfWgNNIPlvG2ttwG1xHc 8Iw== X-Gm-Gg: ASbGncv2lvLraVQ8ZCrNQw3tkznXpRcqpXhmcDR+ExfTTjfNYtbPL5bBPR5DWNclKxm zpt3vUGFLH+6GM4X4WV2xx3ltNajBXtIYOYEgwljjy82QyhSNiVWK5E7cOSz3a5JcCa3ZeQnMyT UKQRDH5o9jyAkxaP9y5RA0jrG1Ve/N89cnkDIGQ1hZDCeHYUI54ky4FL0C/KdVi5BU6i96jNnPk tZp22naDeHRqFydwUiTQRQUsSe7TUtWvoM4O3d/snBrKx+QMQeSyJHZJkHdeMExsKymRC3REnpR 6j6KDvzciTEZqyn7nafx39HTjFs= X-Google-Smtp-Source: AGHT+IGL4y6/3A3Js7jkGuGfGwCWS5QM9JRK0tvKvCtpBlmQMA+3L6Plqx60YSyeedoNVfIqgJeK+Q== X-Received: by 2002:a2e:b5c9:0:b0:300:15d9:c625 with SMTP id 38308e7fff4ca-3072ca6a93bmr99741871fa.14.1737754842930; Fri, 24 Jan 2025 13:40:42 -0800 (PST) Received: from localhost (host-97-144.parnet.fi. [77.234.97.144]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3076baeea5bsm4866141fa.61.2025.01.24.13.40.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 24 Jan 2025 13:40:42 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2025 23:40:41 +0200 Message-Id: <20250124214041.26985-1-martin@martin.st> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: Improve the check for the rsync --contimeout option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Traditionally, macOS has shipped an old version of rsync that lacked support for this version, hence this check (added in a8b3f0c5cf548f654e30c981988bb71981a3f8d3). However, in macOS 15.x, they have switched to providing rsync as a different tool, openrsync. The version of openrsync in at least macOS 15.2 does include "[--contimeout]" (note the lack of "=" after the option), in the output of "rsync --help", but when used, the tool errors out with "rsync: --contimeout=60: unknown option". So apparently the tool erroenously lists the option as supported, while it really isn't. The original rsync tool prints "--contimeout=SECONDS" in the output of "rsync --help". It is unclear which version of openrsync this is; the latest upstream openrsync from OpenBSD does support the option and includes "[--contimeout=seconds]" in the output of "--help", and older versions don't seem to include the option as listed at all. Therefore, check for "--conntimeout=" with the "=", this should properly detect both new enough rsync and openrsync. This fixes running "fate-rsync" on macOS 15.x. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 3a1e72e1c6..06f641ead0 100755 --- a/configure +++ b/configure @@ -7209,7 +7209,7 @@ enabled makeinfo \ disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html perl -v > /dev/null 2>&1 && enable perl || disable perl pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man -rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout +rsync --help 2> /dev/null | grep -q 'contimeout=' && enable rsync_contimeout || disable rsync_contimeout xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint check_headers linux/fb.h -- 2.39.5 (Apple Git-154) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".