Attachment 227648 Details for Bug 258254 – unbreak on i386

[patch] unbreak on i386

0001-www-chromium-unbreak-on-i386.patch (text/plain), 2.82 KB, created by Felix Palmen on 2021-09-03 16:30:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2021-09-03 16:30:27 UTC

Size: 2.82 KB

patch

obsolete

>From a0b2eef4e60431c4bf316c27458a9811ff0d71c1 Mon Sep 17 00:00:00 2001
>From: Felix Palmen <felix@palmen-it.de>
>Date: Fri, 3 Sep 2021 13:05:29 +0200
>Subject: [PATCH] www/chromium: unbreak on i386
>
>FreeBSD's sendfile() expects a pointer to off_t for returning the copied
>size. Change local variables used to off_t for OS_BSD: if any, this is
>wider than the ssize_t used before (on amd64, it's the same).
>---
> www/chromium/Makefile                          |  1 -
> .../patch-base_files_file__util__posix.cc      | 18 ++++++++++++++----
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
>diff --git a/www/chromium/Makefile b/www/chromium/Makefile
>index 5e37021a172a..ebc1697d58ca 100644
>--- a/www/chromium/Makefile
>+++ b/www/chromium/Makefile
>@@ -15,7 +15,6 @@ LICENSE=	BSD3CLAUSE LGPL21 MPL11
> LICENSE_COMB=	multi
> 
> BROKEN_FreeBSD_11_aarch64=	components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous
>-BROKEN_i386=			../../base/files/file_util_posix.cc:1258:29: error: no matching function for call to 'sendfile' (ssize_t vs off_t)
> ONLY_FOR_ARCHS=			aarch64 amd64 i386
> 
> BUILD_DEPENDS=	bash:shells/bash \
>diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
>index c92ce21bda62..9273bee9b600 100644
>--- a/www/chromium/files/patch-base_files_file__util__posix.cc
>+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
>@@ -1,4 +1,4 @@
>---- base/files/file_util_posix.cc.orig	2021-07-19 18:45:05 UTC
>+--- base/files/file_util_posix.cc.orig	2021-08-17 00:15:54 UTC
> +++ base/files/file_util_posix.cc
> @@ -23,6 +23,10 @@
>  #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
>@@ -79,7 +79,17 @@
>  bool CopyFileContentsWithSendfile(File& infile,
>                                    File& outfile,
>                                    bool& retry_slow) {
>-@@ -1246,12 +1254,26 @@ bool CopyFileContentsWithSendfile(File& infile,
>+@@ -1241,17 +1249,36 @@ bool CopyFileContentsWithSendfile(File& infile,
>+     return false;
>+   }
>+ 
>++#if defined(OS_BSD)
>++  off_t copied = 0;
>++  off_t res = 0;
>++#else
>+   size_t copied = 0;
>+   ssize_t res = 0;
>++#endif
>    while (file_size - copied > 0) {
>      // Don't specify an offset and the kernel will begin reading/writing to the
>      // current file offsets.
>@@ -106,7 +116,7 @@
>  
>      copied += res;
>    }
>-@@ -1265,13 +1287,13 @@ bool CopyFileContentsWithSendfile(File& infile,
>+@@ -1265,13 +1292,13 @@ bool CopyFileContentsWithSendfile(File& infile,
>  
>    return res >= 0;
>  }
>@@ -122,7 +132,7 @@
>  BASE_EXPORT bool IsPathExecutable(const FilePath& path) {
>    bool result = false;
>    FilePath tmp_file_path;
>-@@ -1292,6 +1314,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path
>+@@ -1292,6 +1319,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path
>    }
>    return result;
>  }
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 258254: 227648