From patchwork Wed Jan 19 13:48:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33659 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4803659iog; Wed, 19 Jan 2022 05:50:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoZDExq9KGnNwLaYHs0g+v7xydJY5tYGiNeqtvzSzRbA4ELReLDvOZ4eMH6Eb2OshFsuhb X-Received: by 2002:a17:906:9c95:: with SMTP id fj21mr5721074ejc.574.1642600207675; Wed, 19 Jan 2022 05:50:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642600207; cv=none; d=google.com; s=arc-20160816; b=DE/gv74JnM8gnn5rw15Z1uxbIWhukdptBgPEKsMtlghUwKWNUXScoUNy5klMd1WkTq o7ZbaCWl96uBcLfm0Qb2fts2f1q8ApZL1bsU0opRpOjLcWDWjSDk16c57th7U//K4FiJ O6fbgllK9ABH53ewtFx8+1kmEYNgK2EdHOlJbjsaeXIEf925/7nc4o+oSioQQrCBPnpY NkE2f8sUo7+qxQgkCkIkCAolsDFXy+gzrhIcySXxtFB9wtyRbxXSZpRv8xCy3CrLH300 uyNbs2PBcusjqnGU2ioQhrvv+e7QYbBz3WTjE1cXMMJej88BtT2894kBunXSevzQd7oS w7Sw== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=mG0YeCzjycyIYjzysgSZpe67xzwIA0TlYnHxXZg5LNs=; b=izH/TQs+LysQt1YDwn07GAS+kKfBZr84kU5KozzoqfYrQ/DuXHvjh47BVSqSw8kQqR jJV71f6h9ptU3XOP8INOSPYE/YkqyuzPkmv8t+xeeFM/4lsoikn4HZdugJ7h29/lcZ42 KXcMvt5J4iz5tNBtwkQbAlqd57EuRUmpen3Bs4ymu3urldtj1qvT1ml5hBfKDTlfKC4W y4pV2EjHbwrCseKQt+dqX3ku5oksXpT3STwCVXxnOFq8kvIkNMnedahMq9Y6nUzZV2AW WAy8xFt2LcJungXD8QlLlNd+/e4XiJCbojVjS0E6YTw9tH14uyZI1obZ8JGLuanKRDh8 XTog== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bo20si1775766edb.46.2022.01.19.05.50.07; Wed, 19 Jan 2022 05:50:07 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B666F68B00D; Wed, 19 Jan 2022 15:50:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD85868B00D for ; Wed, 19 Jan 2022 15:49:57 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4BAB824017C for ; Wed, 19 Jan 2022 14:49:57 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id tRfDCpzU3Uj1 for ; Wed, 19 Jan 2022 14:49:56 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id ACD54240179 for ; Wed, 19 Jan 2022 14:49:56 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id C80663A067C; Wed, 19 Jan 2022 14:49:56 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 14:48:46 +0100 Message-Id: <20220119134846.19557-1-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <3335e1d2-14ee-8e3c-2e81-a6a077f7ee47@gmail.com> References: <3335e1d2-14ee-8e3c-2e81-a6a077f7ee47@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: link to libatomic when it's present 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: 1NOQGTWSHPjy C11 atomics in some configurations (e.g. 64bit operations on ppc64 with GCC) require linking to libatomic. Fixes #9275 --- configure | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 1413122d87..3059c154df 100755 --- a/configure +++ b/configure @@ -3794,20 +3794,20 @@ cws2fws_extralibs="zlib_extralibs" # libraries, in any order avcodec_deps="avutil" -avcodec_suggest="libm" +avcodec_suggest="libm stdatomic" avdevice_deps="avformat avcodec avutil" -avdevice_suggest="libm" +avdevice_suggest="libm stdatomic" avfilter_deps="avutil" -avfilter_suggest="libm" +avfilter_suggest="libm stdatomic" avformat_deps="avcodec avutil" -avformat_suggest="libm network zlib" -avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt" +avformat_suggest="libm network zlib stdatomic" +avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt stdatomic" postproc_deps="avutil gpl" -postproc_suggest="libm" +postproc_suggest="libm stdatomic" swresample_deps="avutil" -swresample_suggest="libm libsoxr" +swresample_suggest="libm libsoxr stdatomic" swscale_deps="avutil" -swscale_suggest="libm" +swscale_suggest="libm stdatomic" avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs" avfilter_extralibs="pthreads_extralibs" @@ -6324,7 +6324,14 @@ check_headers asm/types.h # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic # so we also check that atomics actually work here -check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar" +# +# some configurations also require linking to libatomic, so try +# both with -latomic and without +for LATOMIC in "-latomic" ""; do + check_builtin stdatomic stdatomic.h \ + "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar" \ + $LATOMIC && eval stdatomic_extralibs="\$LATOMIC" && break +done check_lib advapi32 "windows.h" RegCloseKey -ladvapi32 check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt &&