From patchwork Tue Jun 20 22:49:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4065 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1618602vsw; Tue, 20 Jun 2017 15:51:09 -0700 (PDT) X-Received: by 10.223.142.66 with SMTP id n60mr21907823wrb.188.1497999069364; Tue, 20 Jun 2017 15:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497999069; cv=none; d=google.com; s=arc-20160816; b=p0wJqLcrgnN8YqixighWlk07iiFlhHfP3uKgukg0zqNUQQWTS37dRxDxFRs0MVG2PZ OQcc4RvjXbF70FC3IrBvXXQIs7GxFxc9w17gV+hPSCnBmu5fGatMXvgYHryY/MPGcA42 jqxuHjvPO4drJDQh1kMKu0nrXtKOahYU3yBiwFGaXVUcHMwUgEDXHxsikXz8VdKuS/Ik GPMcj63E2KyhbJSrTb3wBOo3YoCXonhjAf40b/V6VLhlHReYZeWMV8PsDywAM/ARijfX moyk1EEDALMyPf+Kbd7PFOW0hxR+EepMfdUHSD5S3hy8WV6DdVjtKuZMtaqpBmPvJuvh sc3g== 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=6daRahRxqyAuGrDRopaKh4qQWYH7ouxTBRjuvGWLlVo=; b=szlJRXMSjZ5gEPOQMoDwm+tvEFYo64TJzprJrAwVs43cGh/QwK7byOzxfK9zgl8w34 xnvGs2FFF8dQFFMa1NmCmi0qu9aF6l6RWfa/AHPZwv4oMI0mPYUEp94IhrDaGJCplip0 hwc5iKVMnu3X7jK7UE7XoKSeiZFVR3+h3ilm0qaqI50W1I4PDCsymlIU9lvFnkIPx7wN Y9gfhRi5Xocavam0csqt8DlMi9ES2XChUnwFBNLgrpKagdX1J5IZ6fIDTipgeY3Prbhn +kKKkh41d216c8j7tZsUR04OReUUfuwa9sTfSXeE/VmjPKeduR/siQ8L4faBQlX3w0wp pozg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=JUgcChuM; 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 d8si5400001wrc.28.2017.06.20.15.51.08; Tue, 20 Jun 2017 15:51:09 -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=JUgcChuM; 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 8AC3168A339; Wed, 21 Jun 2017 01:50:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FB8D68A229 for ; Wed, 21 Jun 2017 01:50:37 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id d14so13007738qkb.1 for ; Tue, 20 Jun 2017 15:50:42 -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=L8+0CTs3lSDJ/eiXzu8LismxRBC9KaxhrQ1pmzGLiTQ=; b=JUgcChuMgXwNt/69j8i9i0Zkgojzsc8kWA6cqoV/m++mcgKQmw8UzNk6I4cSQWwtFQ aafWyQKn/VytGsWjNPdScAjCI81gjCiEWoJA03w1FncGPrSyaG6lAT75gooWMxATaeZm ZQKxheEdHt3S/44qgBKv0/ssujZAcuhoqwIPjoKIsMBkoPD0VasLtRGjrOI7wtgPqUvU JM/ljMEGbLUD+5fn6XlyVeTJkXfQfNS1hphoxbz+ofbLDoFJOnqau62bBYCvd+sFb1CC xk+yvNSxdJ3xxt5Z33y97+OO7knEtp7I8K55FixvbH5IlJovMPx2hgELJEYyNgzBIlt6 Q2LA== 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=L8+0CTs3lSDJ/eiXzu8LismxRBC9KaxhrQ1pmzGLiTQ=; b=a7TUAZgRmJ1n217hDBee4pnP3vimh3Xv9krPyx2Sy5jJ7BUZuFexFEhT6geh3kIhnp 8TCtublbhLOi3o+BoccnshNODrJWK7m4WeUwy8DpQ1aErraSYrNpiQ9vVnnef+/rSZjl QWc/jmU8UfOkWCNjx45wCqwcPtVyDOnkR3qPb4EQXh1AEd72rO+5Byg5IrjeyWued+YA 2FXxGH8HStr0HdmJnoE7M32qQ4HuK5RCpJhXUyvFG4d0xjw0Tg1mA0lRKMAgO+R5hNDM 6k/L4iB4wlVnlrFaFjwqwg5KSMBCs+s0evViucUEnpp0/VEtheArGWOfrvuoizUOCHF7 k+Eg== X-Gm-Message-State: AKS2vOz4a3Q+/kfUTyrhViEm0iBQVubCIUBYb13L5/nR3mzc3bTXg2hk oiAwWxPjoDDpihSP X-Received: by 10.55.20.147 with SMTP id 19mr24984905qku.204.1497999041262; Tue, 20 Jun 2017 15:50:41 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id o3sm9880465qtb.57.2017.06.20.15.50.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 15:50:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2017 19:49:56 -0300 Message-Id: <20170620224959.2008-3-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 2/5] build: Allow generating dependencies as a side-effect of assembling 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" From: Diego Biurrun (Cherry-picked from libav commit 3c0efbd03349ae68d3a25a082222652a102e3fd4) Signed-off-by: James Almer --- configure | 8 ++++++++ ffbuild/common.mak | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 132f38f62e..2f18a2bb0d 100755 --- a/configure +++ b/configure @@ -3329,6 +3329,7 @@ CXX_O='-o $@' OBJCC_C='-c' OBJCC_E='-E -o $@' OBJCC_O='-o $@' +X86ASM_O='-o $@' LD_O='-o $@' LD_LIB='-l%' LD_PATH='-L' @@ -5490,9 +5491,11 @@ EOF if check_cmd $x86asmexe --version; then enabled x86_64 && x86asm_extra="-m amd64" x86asm_debug="-g dwarf2" + X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' elif check_cmd nasm -v; then x86asmexe=nasm x86asm_debug="-g -F dwarf" + X86ASM_DEPFLAGS='-MD $(@:.o=.d)' if enabled x86_64; then case "$objformat" in elf) objformat=elf64 ;; @@ -6738,6 +6741,7 @@ DEPAS=$as DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) X86ASM=$x86asmexe DEPX86ASM=$x86asmexe +DEPX86ASMFLAGS=\$(X86ASMFLAGS) AR=$ar ARFLAGS=$arflags AR_O=$ar_o @@ -6765,6 +6769,7 @@ CXX_O=$CXX_O NVCC_C=$NVCC_C NVCC_O=$NVCC_O LD_O=$LD_O +X86ASM_O=$X86ASM_O LD_LIB=$LD_LIB LD_PATH=$LD_PATH DLLTOOL=$dlltool @@ -6792,8 +6797,11 @@ CXXDEP=$CXXDEP CCDEP_FLAGS=$CCDEP_FLAGS ASDEP=$ASDEP ASDEP_FLAGS=$ASDEP_FLAGS +X86ASMDEP=$X86ASMDEP +X86ASMDEP_FLAGS=$X86ASMDEP_FLAGS CC_DEPFLAGS=$CC_DEPFLAGS AS_DEPFLAGS=$AS_DEPFLAGS +X86ASM_DEPFLAGS=$X86ASM_DEPFLAGS HOSTCC=$host_cc HOSTLD=$host_ld HOSTCFLAGS=$host_cflags diff --git a/ffbuild/common.mak b/ffbuild/common.mak index b029e2a0fc..e168fb2cfd 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -37,7 +37,7 @@ OBJCFLAGS += $(EOBJCFLAGS) OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) -X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm +X86ASMFLAGS += $(IFLAGS:%=%/) -I$( $(@:.asm=.d) - $(X86ASM) $(X86ASMFLAGS) -I $( $@ + $(DEPX86ASM) $(X86ASMFLAGS) -M -o $@ $< > $(@:.asm=.d) + $(X86ASM) $(X86ASMFLAGS) -e $< | sed '/^%/d;/^$$/d;' > $@ %.o: %.asm - $(DEPX86ASM) $(X86ASMFLAGS) -I $( $(@:.o=.d) - $(X86ASM) $(X86ASMFLAGS) -I $(