From patchwork Tue Jun 20 22:49:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4068 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1618695vsw; Tue, 20 Jun 2017 15:51:25 -0700 (PDT) X-Received: by 10.223.141.146 with SMTP id o18mr18244820wrb.110.1497999085606; Tue, 20 Jun 2017 15:51:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497999085; cv=none; d=google.com; s=arc-20160816; b=XhJLHw9wjE9FEuxWIcpZxOS1FE5stQfvm+odNg87Ke+SUlKMGp8ecrzLLhR46204wF A/2oNW+BigxxGF0mGzAEoPcUJqF2ICwU0t4tAHxQPkcTTumWcVuLKvnBWSXsX7MfJzrm Nml2WkkhbFtpjIlgLuPER6xlG/I1B/I38qMhbTidExjNVzmOQXU/YAJKWYIi9upHRu/W BgfrgoRRFTPHn/P/fnstIAJUvFGDEPQlsC5fjvXJvbGmGZUc881SVMwuJ9A8XlfaBnf6 VX9d7lTOtoGmz6ZmzA2FgYCV7ojQ56UP+PX+yHHUZAEsyOdTFbVYLCkd5N5pty6/osUm TxGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=zlvByG98w1zhhmADVwnIiR4vs5FWPlgYX+gwUZEICnc=; b=BQXLQM8lWHCexAYGpn/9ctQBDEyRBUO5B7P0qBpRRqEGIVVlX7/VfgeeTapU4HKKMA uFFchut/FvNqhSrekH/688o3nWVYIuyAbYSNRui5Xs0a1en0j68cOzFg5XtxwiBZ4cQa DpD8hdC8CbrL3l+ZKDcGVlUjssWF4AEUNIxeDHpF9yfL7BMDqs7qXwv05W/3BLxp4wyJ K8F7Jveg5PtlrZusi3wzYrhutcHDTMrZ+3Yt31SOhtUcPJ17ZzU9iSfXLOcnV4nQUcTU m5fqITOzK3nqjlFWpdnZ8D+OYWzljptnRp7wPn9ZpvrF3p7MlrRcNLF9OAt84NEBe+rF c5rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=SLXyuYFI; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l57si15158642wrl.55.2017.06.20.15.51.25; Tue, 20 Jun 2017 15:51:25 -0700 (PDT) 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=@gmail.com header.b=SLXyuYFI; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E5F568A368; Wed, 21 Jun 2017 01:50:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F3E568A23C for ; Wed, 21 Jun 2017 01:50:39 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id c20so1085794qte.0 for ; Tue, 20 Jun 2017 15:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=VJusEB+gevJP7886FdeG/n0FLMD9Qw5c/4dzglxrY2g=; b=SLXyuYFInHUDQSOQblznZgHrf+HvtyFNCWXsaYpVmm61lXMW2atHMwwFR4TnFqLUUt Q29uWmI3HLKRpWzkEU3HlAOu5hMZ79rW7gC8IIFznujo/sLtbG77m0IInJa06VKqVn3F Qk9NXpz4LkjSLAxXfzrm00FOA56l5IaXbVAxuN0wfg58Y9G+odfLOkunUO1FKsJM6xfi SgcwoVzGJ+k7CuOTSTIKipGdAXtS1djvfiiRvAaygiytM17Caz1I4oANRebAsRIKNGLK wATF532dTHm/SQU7ni8Wn/VLDI71F0kTznsy3SK/35QmWwj2dd6PB5wvd9sQtHlyKkWc zLew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=VJusEB+gevJP7886FdeG/n0FLMD9Qw5c/4dzglxrY2g=; b=dnh/xoC8+jYoiHGc3Ag+a2IbnbuttjxxQt9MM/H5ubbmmxgzHQH1cufXudqSM9axMv JE3cJmp0Sz6Cqa/9ubbqIo+0qYxj6FAFYFWxCzX8Ih2Xl7QyLXvXXIQZC0KGU8s4fZBm t6rB4b3vtdbsbi+q/rlhvv0Gi7Xx4CVbpgvVwmRHMaSiJM6apzovLZQKMsX7J0ElrdM1 iSVkmVLwitLMk0yRq8ioKKGSafaAnfL8Wzi0irR/95dZ7ugp1VphWzRppgzTrQCs+6iN WWoJLOIUW6BZ78oWcArvF0+oOSVFghLsspwSWuQODeJDWqjBM3o0c7lxHDF+ABFJ1Qp4 /rwg== X-Gm-Message-State: AKS2vOzd4jdqj3fTgtB44iSEyma7mfdYm0R7LjT0+J9Nwrx9o1fA5D5i aoMkaMU8jV8Q6VWi X-Received: by 10.237.43.3 with SMTP id p3mr38367386qtd.201.1497999043744; Tue, 20 Jun 2017 15:50:43 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id o3sm9880465qtb.57.2017.06.20.15.50.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 15:50:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2017 19:49:58 -0300 Message-Id: <20170620224959.2008-5-jamrial@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170620224959.2008-1-jamrial@gmail.com> References: <20170620224959.2008-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] build: fix commandline selection of nasm X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" "nasm --version" works on nasm since around version 2.11 and as such configure assumed it was yasm. Based on libav commit f54037da8af2f2aeb5e5633b48434211e6a97fe5 by Diego Biurrun. Signed-off-by: James Almer --- configure | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 170089753a..a1957b2843 100755 --- a/configure +++ b/configure @@ -5489,16 +5489,26 @@ EOF enabled ssse3 && check_inline_asm ssse3_inline '"pabsw %xmm0, %xmm0"' enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"' - if ! disabled_any asm mmx x86asm; then - if check_cmd $x86asmexe --version; then - x86asm_debug="-g dwarf2" - X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' - elif check_cmd nasm -v; then - x86asmexe=nasm + probe_x86asm(){ + x86asmexe_probe=$1 + if check_cmd $x86asmexe_probe -v; then + x86asmexe=$x86asmexe_probe + x86asm_type=nasm x86asm_debug="-g -F dwarf" X86ASM_DEPFLAGS='-MD $(@:.o=.d)' + elif check_cmd $x86asmexe_probe --version; then + x86asmexe=$x86asmexe_probe + x86asm_type=yasm + x86asm_debug="-g dwarf2" + X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' fi + } + if ! disabled_any asm mmx x86asm; then + for program in $x86asmexe yasm nasm; do + probe_x86asm $program + test -n "$x86asm_type" && break + done X86ASMFLAGS="-f $objformat" enabled pic && append X86ASMFLAGS "-DPIC" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" @@ -6599,6 +6609,7 @@ echo "big-endian ${bigendian-no}" echo "runtime cpu detection ${runtime_cpudetect-no}" if enabled x86; then echo "standalone assembly ${x86asm-no}" + echo "x86 assembler ${x86asmexe}" echo "MMX enabled ${mmx-no}" echo "MMXEXT enabled ${mmxext-no}" echo "3DNow! enabled ${amd3dnow-no}"