Page MenuHomeFreeBSD

devel/electron*: Fix build on main
ClosedPublic

Authored by jrm on Jul 21 2024, 3:47 PM.
Tags
None
Referenced Files
F103055936: D46054.diff
Wed, Nov 20, 8:51 AM
Unknown Object (File)
Tue, Oct 29, 9:22 PM
Unknown Object (File)
Fri, Oct 25, 9:17 AM
Unknown Object (File)
Wed, Oct 23, 12:24 AM
Unknown Object (File)
Oct 11 2024, 3:54 AM
Unknown Object (File)
Oct 7 2024, 2:10 AM
Unknown Object (File)
Oct 7 2024, 2:10 AM
Unknown Object (File)
Oct 7 2024, 2:10 AM
Subscribers

Details

Summary
After src snapshot 0c47b9c211e, the build began failing with:

../../third_party/nasm/include/compiler.h:249:21: error: static
 declaration of 'mempcpy' follows non-static declaration
  249 | static inline void *mempcpy(void *dst, const void *src, size_t n)
      |                     ^
/usr/include/string.h:71:8: note: previous declaration is here
   71 | void    *(mempcpy)(void * __restrict, const void * __restrict, size_t);
      |           ^

Restore the default definition of HAVE_MEMPCPY as mempcpy() has been
available since 13.1, and remove a patch used to detect mempcpy() in
/usr/include/string.h, as it is no longer necessary and does not match
the function.
Test Plan

I'm still running build tests. Will update here soon.

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jrm requested review of this revision.Jul 21 2024, 3:47 PM
jrm created this revision.

There is another proposed patch (for www/qt6-webengine) at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280376, which is also applicable to devel/electron*.

In addition to the changes to patch-third__party_nasm_config_config-linux.h, we should remove patch-third__party_nasm_BUILD.gn altogether. Those changes are remnants from the time when not all FreeBSD versions did not support mempcpy(3).

Can you update the changes accordingly?

Thanks,
Hiroki

This revision now requires changes to proceed.Jul 22 2024, 4:54 AM

Also remove patch-third__party_nasm_BUILD.gn.

Looks good to me. Thank you!

This revision is now accepted and ready to land.Jul 22 2024, 12:05 PM
This revision was automatically updated to reflect the committed changes.