From patchwork Mon Mar 7 14:16:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Ratiu X-Patchwork-Id: 34629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1516189nkx; Mon, 7 Mar 2022 06:16:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhDKlBBNjTf7nkYmMEAnSHaYYbNBAeHbasLvKvKL6VUVpgEGOz6UbJHQR4kt5J9mwQU159 X-Received: by 2002:a17:906:b102:b0:6db:1487:e73 with SMTP id u2-20020a170906b10200b006db14870e73mr5469300ejy.474.1646662585600; Mon, 07 Mar 2022 06:16:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646662585; cv=none; d=google.com; s=arc-20160816; b=rI/j774YXQSVePKzie/jXnlpOKqLHgGS8uowXCjA6+2NlBGPb7M/ViHLEQnPInwRM+ 1WlyJGLDVMfwdMSvE5PkkuZkwRbhKZXD4yXuUr4nBME6I8FyGc5bcPYAvF/gjCUcP1yK uFW7UHXFfMhyujNt4HNc4zuwzKn/On77FzKRMekaaVmOnpnxDYFHwIidSI8LJ4+ePUlJ mSEFVa5CsjVUjuLLV/V+YVZfNY8DFNHOsGDEjjrjyGXgLP7D2Oerjj8chVO0BgtCxvdv x7UAYjMsncHXR2p6FhJ7F5tToK8os+tv8wJwvYL+v1hHfpX8xSeCq8CBX6S9uxvlcRud Gr5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=kXVIfgm64jF/MpiIzHGT15oHk6bHobb9bqkt4PrzIGk=; b=ydN28wa1vgN3Rbu5so5LZVpaMsvSFhrAbdmHUx2bXoAvXDTVbXazNQE7gMUMp17SRq bccCYyjUGssJJt/NalsyxoYUcpfvMgBNljVzsEhr2OQ7yQnPrS+H1HNN92I5wyfsPZJ+ i4EAPRpsrk2ta8PaSkP06XRnjE0gqTqNO4JRRk1e5BeLVrOsrUT06950CpvvWURZSOCl 4/O7yaV/5tMcesigkFmuvI0ilrYriPCneVnhDXQdqnUX/FD4hn8eqfvMJbbHo/aMiaoo OQC1B2S35e+W8AvyCjjZlKthtPJHyV3gsefFFoapq+bY48PIKBPa+Vn0X/uEqUSkZXZo h/UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@collabora.com header.s=mail header.b=KCHX05Ch; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r9-20020a05640251c900b00415c51ed3casi8351742edd.397.2022.03.07.06.16.24; Mon, 07 Mar 2022 06:16:25 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@collabora.com header.s=mail header.b=KCHX05Ch; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CFC368B0CD; Mon, 7 Mar 2022 16:16:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7043D68AB82 for ; Mon, 7 Mar 2022 16:16:13 +0200 (EET) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: aratiu) with ESMTPSA id 7A5F01F43C08 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1646662572; bh=0/r8NNwgZ5QjJUwsZbCjq+/7axNPkJprbKQtdR1z2rQ=; h=From:To:Subject:Date:From; b=KCHX05ChfzHsNSpAZmCarDtF2pw2x3z3bQeBsWmFfuy9km4fgEZuTddrXCMYeCp5p XeCcy0BQlIUgPrg6OrXw/WLGmnnWUiREsQ3h4kqjKx4VXvFjoGJ2z0sjjfsS18fSxT 7imhpzZquWknnpSLXX1TVIoI8Amt/6tUOh+jVlE/54qGxLmgfqtHaaRrDMlF2l7qf/ JQzonAuIMNmG6uKH8cN5hyeoobzRUYDS87yUD4pz5G54PCGsHz89QEJiydFKU+HIlC YTT8q6B8VB4tgaqm55qoXNLvHQbCVo2tc0QXkeCYc9B02ERp3KM/7Emxc+PVXuMu6v QJvOSZ+tIJS/A== From: Adrian Ratiu To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Mar 2022 16:16:04 +0200 Message-Id: <20220307141604.258466-1-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH RESEND] configure: move ranlib -D test after setting defaults 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LdmWGHcTpgST In Gentoo and ChromeOS we want to allow pure LLVM builds without using GNU tools, so we block any unwanted mixed GNU/LLVM usages (GNU tools are still kept around in our chroots for projects like glibc which cannot yet be built otherwise). The default ${cross_prefix}${ranlib_default} points to GNU and fails, so move the test a bit later - after the defaults are set and the proper values get overriden - such that ffmpeg configure calls the llvm-ranlib we desire. [1] [1] https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild?id=7a34377e3277a6a0e2eedd40e90452a44c55f1e6#n477 Signed-off-by: Adrian Ratiu --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 650b52fcc5..98e29b49f9 100755 --- a/configure +++ b/configure @@ -4400,11 +4400,7 @@ cc_default="${cross_prefix}${cc_default}" cxx_default="${cross_prefix}${cxx_default}" nm_default="${cross_prefix}${nm_default}" pkg_config_default="${cross_prefix}${pkg_config_default}" -if ${cross_prefix}${ranlib_default} 2>&1 | grep -q "\-D "; then - ranlib_default="${cross_prefix}${ranlib_default} -D" -else - ranlib_default="${cross_prefix}${ranlib_default}" -fi +ranlib_default="${cross_prefix}${ranlib_default}" strip_default="${cross_prefix}${strip_default}" windres_default="${cross_prefix}${windres_default}" @@ -4437,6 +4433,10 @@ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ enabled cross_compile || host_cc_default=$cc set_default host_cc +if ${ranlib} 2>&1 | grep -q "\-D "; then + ranlib="${ranlib} -D" +fi + pkg_config_fail_message="" if ! $pkg_config --version >/dev/null 2>&1; then warn "$pkg_config not found, library detection may fail."