From patchwork Mon Jun 14 12:13:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 28266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp2803853iol; Mon, 14 Jun 2021 05:39:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx89vudKThAxriYFafU01f8RxUdraKBLVhi+tuQ2U35YJBnDWOo/MFs12ZWYvcis/ZcLCbU X-Received: by 2002:a50:ec08:: with SMTP id g8mr17093442edr.376.1623674347356; Mon, 14 Jun 2021 05:39:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623674347; cv=none; d=google.com; s=arc-20160816; b=Z8Odjgb4pVcOfozAXaE+s8K//l9Gjc/5+PR7vLAqQ/WgLsEqQ6LiYUFkZzGJCoXY4f yh8JezbhWNYqk2qYR2qEMTP+UOjIhJ/eAKMZ/MmwtaEiKbQ7mMg8a3k//aNPT8m+Jixc xRZtDBm+zp2tCRR+HIVGwjaxWHzfDE9qmN/ntVNbg33TatJv1qXgOloW99WUsG43wLOp QKjMY1IsGMqvoEMjxuyY5pLFWteASPpcx0/iOaN797a4TSRXA2fivMJntA0wtzifc4H9 6cEKB8n8lGnv/VvwvzejHppK3MEh0GXqM2P5rD+JAm035F0IlU2TVxateXetE8q6u0a2 g18Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=TQJ3CWpchLmwqayRld6tXq4y9TTVJ28Eg+nqikTXiKk=; b=m2hm8Bn7KNOWOg4YA3WzlCXdg7HW0zu0oHGnp/WgNJy+iSuJNS/lMmahMR9Pz7eE+c Jq1QEOHBxeqohb0Gf0TThSdhhkDtKc6MHvdRJ2y7SfoxsdJJROadIJnRwakX4eHgN6kP r6srB3/uTz+dOToMfl8fp4vKPQaCJEx5Sw/Jy6LD/Ok8Wv7TxrqJQ/OLgezdy57GNjIV /ZoamqLAtPUBmOEu3JzhuL45kEjfV7lQVFt2DYQ0Hq/y9QgOscJli4q+AiFw6gRY2KMb imiCv5I+kfxeo3UVLOk2wKZyBFQXPRYskSU+uH3JQfd1oVUlYWFh6IuFCsd7IpVQanzX uS7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20150623.gappssmtp.com header.s=20150623 header.b="V1J/Kf3e"; 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 z11si6865082edx.62.2021.06.14.05.39.06; Mon, 14 Jun 2021 05:39:07 -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=@martin-st.20150623.gappssmtp.com header.s=20150623 header.b="V1J/Kf3e"; 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 2A7446808D6; Mon, 14 Jun 2021 15:39:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76264680378 for ; Mon, 14 Jun 2021 15:38:56 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id f2so14378800wri.11 for ; Mon, 14 Jun 2021 05:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Bbqe8+08VAyFd/aiqx5DIKDjn5mv1kQLqrCjz2gpSZc=; b=V1J/Kf3e/M3M07xD2ySUzPU0qfXIzbRcKw+4C/e7nUVXbwtTn93sE2fnRdqpykKDT2 GlBuE+eE8BRU/lEgxvA9ACtXY4uNeFwfWTf+cVBtVx9b5Dl+JuVloFFr+8tyJr07hNXq rLZwTtrtgvYEDmbIVmliYqfP+h2V4awWBqjXZQlp0lh5YyTO+F55WObPRufbyPyOhXaP I/yzU6BZGVFPmh9trHQEvPKAWhqfMvKeCNczINrdKJuzcmP41g2hQFKVm1qIVBJG2bnE mT7tKDKl6yTRoQBHzu2nVlNTbzrBTeY9JVSslxX1RcuguLNacmbyuAbKM0fWxLuJGwkj jNKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Bbqe8+08VAyFd/aiqx5DIKDjn5mv1kQLqrCjz2gpSZc=; b=L0XEPp+iLhiTw5Q5FOIQx4QuxVevTbR6ipC7CugY/8D0NUNu07Dh2yVNF69TkYz4xS nAvUD6ALxjtHl90O4KHKLNxteMrwEAUi1LGC/AMmHS1wVkScSn+tPb+QFcV6JxfqQXam NQU50AeGFMUuUwO6LjOiIDQpVXVoC8SkMHOAfaKgjyiOu5wgSZtp7B0G2d3xJ0HWZIiz hrYYpd/Un19vWNYMwCGjPEwWZfA0YE5TTwNwhNuurYjjzib1i8p4768/N2v+KggJJ194 k1By9DOb2JFRuKdWQl+Zf0V56sDIB7HW/gGE01Oj21uRh4w2vTkIwYr3PMlpHmg40T1Y SfLA== X-Gm-Message-State: AOAM53273eflOdfhJmZghfPajaDSF6to4TJbhVAaM2/HuVRMpA24kQkr XYrqc/1xQugPVfDarZx+cu4/XR7iExapBQEr X-Received: by 2002:ac2:428e:: with SMTP id m14mr11571594lfh.478.1623672801646; Mon, 14 Jun 2021 05:13:21 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id q2sm1789832ljj.7.2021.06.14.05.13.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 05:13:20 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Jun 2021 15:13:19 +0300 Message-Id: <20210614121319.2631045-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Avoid using the --preprocessor argument to windres 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 Cc: Kyle Schwarz , James Almer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A/EmVrY66PF7 Instead use --preprocessor-arg; in binutils 2.36, the --preprocessor flag was changed so that it no longer accepts a string containing multiple arguments, but the whole --preprocessor argument is treated as the path to the preprocessor executable (where the path can contain spaces). It's currently unclear whether this behaviour will stay or if it is going to be reverted in the future, see discussion at [1]. Just to be safe, avoid using the --preprocessor argument. Don't redeclare the full preprocessing command, but just add the $(CC_DEPFLAGS) options. Based on a patch by Kyle Schwartz. [1] https://sourceware.org/bugzilla/show_bug.cgi?id=27594 --- configure | 1 - ffbuild/common.mak | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 6bfd98b384..87c8e85fe6 100755 --- a/configure +++ b/configure @@ -7535,7 +7535,6 @@ LD_LIB=$LD_LIB LD_PATH=$LD_PATH DLLTOOL=$dlltool WINDRES=$windres -DEPWINDRES=$dep_cc DOXYGEN=$doxygen LDFLAGS=$LDFLAGS LDEXEFLAGS=$LDEXEFLAGS diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 32f5b997b5..5d8f3dfc1f 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -90,7 +90,7 @@ COMPILE_MSA = $(call COMPILE,CC,MSAFLAGS) -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) %.o: %.rc - $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< + $(WINDRES) $(IFLAGS) $(foreach ARG,$(CC_DEPFLAGS),--preprocessor-arg "$(ARG)") -o $@ $< %.i: %.c $(CC) $(CCFLAGS) $(CC_E) $<