On 10/01/23 18:41 +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Jan 08 2023, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
> 
> [...]
> 
> >> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/www/chromium.txt
> > [patch]
> > ../../third_party/libsync/src/sync.c:117:17: error: incompatible integer to 
> > pointer conversion assigning to 'struct sync_fence_info_data *' from 'int' 
> > [-Wint-conversion]
> >     legacy_info = malloc(4096);
> >                 ^ ~~~~~~~~~~~~
> >
> >> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/www/iridium.txt
> > [patch]
> > ../../third_party/libsync/src/sync.c:117:17: error: incompatible integer to 
> > pointer conversion assigning to 'struct sync_fence_info_data *' from 'int' 
> > [-Wint-conversion]
> >     legacy_info = malloc(4096);
> >                 ^ ~~~~~~~~~~~~
> > https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/www/ungoogled-chromium.txt
> > [patch]
> > ../../third_party/libsync/src/sync.c:117:17: error: incompatible integer to 
> > pointer conversion assigning to 'struct sync_fence_info_data *' from 'int' 
> > [-Wint-conversion]
> >     legacy_info = malloc(4096);
> >                 ^ ~~~~~~~~~~~~
> 
> Diff for those below, they are sufficient for thise ports to package
> successfully when built with clang 15.  I'll add the REVISION bump at
> commit time.  ok?
> 
> llvm 15 test material:
> git branch: https://github.com/jcourreges/openbsd-src/tree/llvm15-6
> amd64 snaps: https://pbuild-amd64.wxcvbn.org/pub/OpenBSD/snapshots/amd64/
> 
> 
> Index: www/chromium/patches/patch-third_party_libsync_src_sync_c
> ===================================================================
> RCS file: 
> /home/cvs/ports/www/chromium/patches/patch-third_party_libsync_src_sync_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-third_party_libsync_src_sync_c
> --- www/chromium/patches/patch-third_party_libsync_src_sync_c 2 Feb 2022 
> 17:36:39 -0000       1.2
> +++ www/chromium/patches/patch-third_party_libsync_src_sync_c 27 Dec 2022 
> 12:00:45 -0000
> @@ -1,17 +1,16 @@
>  Index: third_party/libsync/src/sync.c
>  --- third_party/libsync/src/sync.c.orig
>  +++ third_party/libsync/src/sync.c
> -@@ -17,7 +17,9 @@
> +@@ -17,7 +17,7 @@
>    */
>   
>   #include <fcntl.h>
> -+#if !defined(__OpenBSD__)
> - #include <malloc.h>
> -+#endif
> +-#include <malloc.h>
> ++#include <stdlib.h>
>   #include <stdint.h>
>   #include <string.h>
>   #include <errno.h>
> -@@ -29,6 +31,12 @@
> +@@ -29,6 +29,12 @@
>   
>   #include <sync/sync.h>
>   
> Index: www/iridium/patches/patch-third_party_libsync_src_sync_c
> ===================================================================
> RCS file: 
> /home/cvs/ports/www/iridium/patches/patch-third_party_libsync_src_sync_c,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-third_party_libsync_src_sync_c
> --- www/iridium/patches/patch-third_party_libsync_src_sync_c  28 Mar 2022 
> 10:49:15 -0000      1.5
> +++ www/iridium/patches/patch-third_party_libsync_src_sync_c  27 Dec 2022 
> 12:00:55 -0000
> @@ -1,17 +1,16 @@
>  Index: third_party/libsync/src/sync.c
>  --- third_party/libsync/src/sync.c.orig
>  +++ third_party/libsync/src/sync.c
> -@@ -17,7 +17,9 @@
> +@@ -17,7 +17,7 @@
>    */
>   
>   #include <fcntl.h>
> -+#if !defined(__OpenBSD__)
> - #include <malloc.h>
> -+#endif
> +-#include <malloc.h>
> ++#include <stdlib.h>
>   #include <stdint.h>
>   #include <string.h>
>   #include <errno.h>
> -@@ -29,6 +31,12 @@
> +@@ -29,6 +29,12 @@
>   
>   #include <sync/sync.h>
>   
> Index: www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c
> ===================================================================
> RCS file: 
> /home/cvs/ports/www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-third_party_libsync_src_sync_c
> --- www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c       
> 4 Oct 2022 12:56:00 -0000       1.1.1.1
> +++ www/ungoogled-chromium/patches/patch-third_party_libsync_src_sync_c       
> 30 Dec 2022 18:50:07 -0000
> @@ -1,17 +1,16 @@
>  Index: third_party/libsync/src/sync.c
>  --- third_party/libsync/src/sync.c.orig
>  +++ third_party/libsync/src/sync.c
> -@@ -17,7 +17,9 @@
> +@@ -17,7 +17,7 @@
>    */
>   
>   #include <fcntl.h>
> -+#if !defined(__OpenBSD__)
> - #include <malloc.h>
> -+#endif
> +-#include <malloc.h>
> ++#include <stdlib.h>
>   #include <stdint.h>
>   #include <string.h>
>   #include <errno.h>
> -@@ -29,6 +31,12 @@
> +@@ -29,6 +29,12 @@
>   
>   #include <sync/sync.h>
>   
> 

Hi

No. Please keep the OpenBSD ifdef. I am just doing an update of chromium so I 
will take care
of these if you don't mind. 

Reply via email to