From patchwork Wed Jan 31 22:35:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WGlhb2hhbiBXYW5nICjnjovmtojlr5Ip?= X-Patchwork-Id: 7467 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp2295884jak; Wed, 31 Jan 2018 14:41:42 -0800 (PST) X-Google-Smtp-Source: AH8x225UoIq9iqKa+HCx+fANPmZe2CqvJSXrO2yMexWeToq/aItAhx8NJcugQMoHnVo0yb1gFdbk X-Received: by 10.223.133.141 with SMTP id 13mr336127wrt.226.1517438502750; Wed, 31 Jan 2018 14:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517438502; cv=none; d=google.com; s=arc-20160816; b=VacdH10xMNKodY2XPGPWz44Ak1GEYoGhv9kZFIO1k52dOhB6N+8FNswaJrWdFhOw2Y 6rK6ws9Iz9fa73HE/N3CW3qvgYsKq+uN63/RoxkBo0r+QFNXeXYfp/zN5Moz7JjwN1eK owKvw9oG3YryMM/qipYfwU7SemD79xjYYfcqkF4zIfstZm2tv1WonTDN6ZQzBOcRI253 XHll+ys16yyRmJj3FSeO65TYNXw5LtqLJT52gj0VMwsgjVviInXM1yhBwfLgtqkUIw5S jNaOA+kJhXT0v98eMWatAqHE5BR+GK0YbkhC959Sdnq6TmZxFNm7TO/6Y1z0Ryh5v/Mw Oiag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:dkim-signature :delivered-to:arc-authentication-results; bh=A7jZfR66BsXH7aXaRQlEl/YA9kPM2VkOPUGWWQRlIgU=; b=xNzKRKJwHE2P/8PrBwLfJ0Bx1tO3oltIFrdtPEjrK3/4BgrnAid/DzAFeT7brT/RGd uH2TN7tYJwHsmNsZKJeFbrwNNkglgIiKQmQkwPWB2iuHry3KvYjTu5N1xhIiwzrSF/Ge 9VO1eoVg7wQV89e0X9b+ytmDxu6JRGRLyAmY4ottOtUYg1QzSfAf72dA/w5LWwEuO6vN W1JPSyJa6z4CObo+lgoWQsMMazGVdreD/2HidEEdb1+TrJRxTcT3ZF8LeD5BrGpHSz3S jlD6VC1Ii3L2KLwEPtec9NvtFathLcv3FxY4Eia3K4IUpP50nUfCYl+Epi3eXUbJ4iuk 4X3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=jcmxjIq/; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=mkPBdVf9; 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=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 79si489564wmg.254.2018.01.31.14.41.42; Wed, 31 Jan 2018 14:41:42 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=jcmxjIq/; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=mkPBdVf9; 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=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EAB5689A70; Thu, 1 Feb 2018 00:41:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f181.google.com (mail-yw0-f181.google.com [209.85.161.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB5FB689A31 for ; Thu, 1 Feb 2018 00:41:28 +0200 (EET) Received: by mail-yw0-f181.google.com with SMTP id u21so8887986ywc.2 for ; Wed, 31 Jan 2018 14:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=9DsvDqdoOXb34zFafaVEWPGJunQfijHtoAL2+6FKYVM=; b=jcmxjIq/64lD0PvWQsk9ql37oSF06esijg/CYP768OpRBCEAmnsw8v2oEIu7o2+kCG HHu3v3MXXsFQvvPjSPppE70QYSDSlHaMDUUyLid2CvoTTSvvZPiPDj/Gn74B2qsNxlOM H99bmwgublO5LIGyNZOkvVompht50gVW8EAHW1e7EbsFzHVhLu9McB57NYFhhdnUR667 iYWr1mled6ui/zrqM0pnjFg6OTy55xpTuyqZKnYy+lOFndXhAaD33tesCyujGTVobHqa B7fPcisos/6CzR+FxpXjsUZ5pUQbL15xDZTx3a6kb5uNHnmHYTU2IdybTYi7N9WnYbFp lSBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to; bh=9DsvDqdoOXb34zFafaVEWPGJunQfijHtoAL2+6FKYVM=; b=mkPBdVf9cUiaYES5lwyELy6q4liDK3VqUxcgNKYdXTC65+Mhd6WD62ZoLOJDztjGRr GA2pzoTG3SJtF+st5dgHtdYpR5fYaJfsCqS/cLlZCQ1ZCDqZ7OYGaMUJJv031MUIqKUo JXa6XcLXzx8s+DV4bVYYa8voKQZCOGzxefa8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=9DsvDqdoOXb34zFafaVEWPGJunQfijHtoAL2+6FKYVM=; b=HDH6fqfj02ecQIGteH0T4Ig2k9p0YdwvtWUoHbILjsQd9q1kYQku1N7/NXAkEbDuEL BKgG0ZrD794jUdl/oQCyRVucaktvIzA2AR6DFcuVD9hJi28al2LarGhQ31JEekej24IC saKoOASudzVKm9sbqo62589spKCcc9vuh9O+1nb8zyMfsI1Y1mNsy2+h8d45n7z7Z4Ro c4zyo+558eh76J1VP6SQ6F0CC6hdnS7NXi7ckiJqjX+s16uQZVsttBBeyrxi4Syz291A J7skiHvJZ8PdMvHSjOJLADpzC92zw0odTtoDEtG49nNaNicUKN2gik06QtFdIDl0I+ed arWw== X-Gm-Message-State: AKwxyte4o7IEjuaSRVorMncXmuT5Dku7WvW32rMvat53naoztRzuJxbd 5F6wp6PBAIyRA4l3AlTMtcyyMZspKSaksWjssw0j8bGXkK8= X-Received: by 10.37.91.8 with SMTP id p8mr1955186ybb.46.1517438150135; Wed, 31 Jan 2018 14:35:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.37.132.77 with HTTP; Wed, 31 Jan 2018 14:35:29 -0800 (PST) From: =?UTF-8?B?WGlhb2hhbiBXYW5nICjnjovmtojlr5Ip?= Date: Wed, 31 Jan 2018 14:35:29 -0800 X-Google-Sender-Auth: wqvTg9Z_KfMXGxXK5Si1Z4NeHS4 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] Remove carriage return ('\r') in Windows CC_IDENT 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 07e33b2aa09b8b224ac35a5b56b29490a6486bdf Mon Sep 17 00:00:00 2001 From: Xiaohan Wang Date: Wed, 31 Jan 2018 14:20:02 -0800 Subject: [PATCH] Remove carriage return ('\r') in Windows CC_IDENT Currently the Windows CC_IDENT is ended with '\r\n'. "head -n1" will not remove the '\r' and this is causing building error in Chromium. This CL adds "tr -d '\r'" to remove '\r' in the CC_IDENT string. Since in most cases '\r' only appears at the end of a string/line, this should work in most cases. See example: printf "hello\r\nworld\r\n" | head -n1 | hd 00000000 68 65 6c 6c 6f 0d 0a |hello..| printf "hello\r\nworld\r\n" | head -n1 | tr -d '\r' | hd 00000000 68 65 6c 6c 6f 0a |hello.| Also note a similar previous change at: https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2013-October/069950.html --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index a83581ea98..4a68c6364d 100755 --- a/configure +++ b/configure @@ -4289,7 +4289,7 @@ probe_cc(){ _ld_path='-libpath:' elif $_cc -nologo- 2>&1 | grep -q Microsoft; then _type=msvc - _ident=$($_cc 2>&1 | head -n1) + _ident=$($_cc 2>&1 | head -n1 | tr -d '\r') _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)' _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs' _cflags_speed="-O2" -- 2.16.0.rc1.238.g530d649a79-goog