FreeBSD Bugzilla – Attachment 227998 Details for
Bug 257378
devel/electron12: Fails to build: third_party/nasm/include/compiler.h:249:21: error: static declaration of 'mempcpy' follows non-static declaration (stable/13 amd64)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch based on Bug257352 and Bug258271 for www/chromium
electron12-nasm-build-fix2-after-stable13-dba677d13b26.diff (text/plain), 1.67 KB, created by
Tomoaki AOKI
on 2021-09-19 05:47:51 UTC
(
hide
)
Description:
Patch based on Bug257352 and Bug258271 for www/chromium
Filename:
MIME Type:
Creator:
Tomoaki AOKI
Created:
2021-09-19 05:47:51 UTC
Size:
1.67 KB
patch
obsolete
>--- devel/electron12/Makefile 2021-09-19 07:04:57.236620000 +0900 >+++ devel/electron12/Makefile 2021-09-19 09:45:00.672994000 +0900 >@@ -152,6 +152,12 @@ TEST_ALL_TARGET= ${TEST_TARGETS} > .include "Makefile.version" > .include <bsd.port.pre.mk> > >+# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. >+# Nested variable expansion avoids executing the test when not needed for >+# expanding EXTRA_PATCHES. >+EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ >+ || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} >+ > .if ${ARCH} == "amd64" > PLIST_SUB+= AMD64="" > .else > >--- /dev/null >+++ devel/electron12/files/extra-patch-no-mempcpy-nasm 2021-07-31 21:32:15.542747000 +0900 >@@ -0,0 +1,11 @@ >+--- third_party/nasm/config/config-linux.h.orig 2021-01-07 00:39:33 UTC >++++ third_party/nasm/config/config-linux.h >+@@ -336,7 +336,7 @@ >+ #define HAVE_MEMORY_H 1 >+ >+ /* Define to 1 if you have the `mempcpy' function. */ >+-#define HAVE_MEMPCPY 1 >++/* #undef HAVE_MEMPCPY */ >+ >+ /* Define to 1 if you have a working `mmap' system call. */ >+ #define HAVE_MMAP 1 > >--- devel/electron12/files/patch-third__party_nasm_config_config-linux.h.orig 2021-05-12 06:00:55 +0000 >+++ devel/electron12/files/patch-third__party_nasm_config_config-linux.h 2021-08-06 08:43:06 +0900 >@@ -18,15 +18,6 @@ > > /* Define to 1 if you have the `faccessat' function. */ > #define HAVE_FACCESSAT 1 >-@@ -336,7 +336,7 @@ >- #define HAVE_MEMORY_H 1 >- >- /* Define to 1 if you have the `mempcpy' function. */ >--#define HAVE_MEMPCPY 1 >-+/* #undef HAVE_MEMPCPY */ >- >- /* Define to 1 if you have a working `mmap' system call. */ >- #define HAVE_MMAP 1 > @@ -411,7 +411,7 @@ > #define HAVE_SYSCONF 1 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=227998">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
koobs
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 257378
:
226650
|
227006
| 227998