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 ESMTP id 13F3A41124 for ; Mon, 14 Feb 2022 13:00:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1ECC868B194; Mon, 14 Feb 2022 15:00:27 +0200 (EET) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9492F68A5F4 for ; Mon, 14 Feb 2022 15:00:20 +0200 (EET) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: aratiu) with ESMTPSA id 449081F43918 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1644843619; bh=Zw+Z/EhQ7yvoVFZNyAZ/oCrH2L9Fxoj/4kW8N6n7h/Q=; h=From:To:Subject:Date:From; b=VzgQUbljdcnY1Cv+qscFL/Uq3j/uNGFnmVP57A5dnH8OWrEjLtPSCkQ3v3FXPsxiX CjYtUYz280fGFhViFALRJs4lCFP3fDtG+6E0O4+DUsxFLNH9PUxva0bb7HHJS/J0ZM l5H897C5vixo7OegtBykMbv7Yjh5+j055Toq7x9aykd++XOnUhWMZ4+6AvqD8ADQ63 ABKMAKggppsyCj4JnBcYa2dhXUmp7SZ8ASEJTrdBqt9plEe1VOBtwT+AwVN+pei1zk eji2ZElgtjBOoQkOd1Dl5oemx315sJvk/DYtqNHZkmwBfBVeqa6B4z6ALhTte3r8Qf 6vMBTfLU/mQ0Q== From: Adrian Ratiu To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Feb 2022 15:00:07 +0200 Message-Id: <20220214130007.2781962-1-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 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: 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 a251e27723..61c150959e 100755 --- a/configure +++ b/configure @@ -4416,11 +4416,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}" @@ -4453,6 +4449,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." -- 2.35.0 _______________________________________________ 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".