View | Details | Raw Unified | Return to bug 257378 | Differences between
and this patch

Collapse All | Expand All

(-)devel/electron12/Makefile (+6 lines)
Lines 152-157 TEST_ALL_TARGET= ${TEST_TARGETS} Link Here
152
.include "Makefile.version"
152
.include "Makefile.version"
153
.include <bsd.port.pre.mk>
153
.include <bsd.port.pre.mk>
154
154
155
# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base.
156
# Nested variable expansion avoids executing the test when not needed for
157
# expanding EXTRA_PATCHES.
158
EXTRA_PATCHES+=	${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \
159
	|| ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:}
160
155
.if ${ARCH} == "amd64"
161
.if ${ARCH} == "amd64"
156
PLIST_SUB+=	AMD64=""
162
PLIST_SUB+=	AMD64=""
157
.else
163
.else
(-)devel/electron12/files/extra-patch-no-mempcpy-nasm (+11 lines)
Added Link Here
1
--- third_party/nasm/config/config-linux.h.orig	2021-01-07 00:39:33 UTC
2
+++ third_party/nasm/config/config-linux.h
3
@@ -336,7 +336,7 @@
4
 #define HAVE_MEMORY_H 1
5
 
6
 /* Define to 1 if you have the `mempcpy' function. */
7
-#define HAVE_MEMPCPY 1
8
+/* #undef HAVE_MEMPCPY */
9
 
10
 /* Define to 1 if you have a working `mmap' system call. */
11
 #define HAVE_MMAP 1
(-)devel/electron12/files/patch-third__party_nasm_config_config-linux.h (-9 lines)
Lines 18-32 Link Here
18
 
18
 
19
 /* Define to 1 if you have the `faccessat' function. */
19
 /* Define to 1 if you have the `faccessat' function. */
20
 #define HAVE_FACCESSAT 1
20
 #define HAVE_FACCESSAT 1
21
@@ -336,7 +336,7 @@
22
 #define HAVE_MEMORY_H 1
23
 
24
 /* Define to 1 if you have the `mempcpy' function. */
25
-#define HAVE_MEMPCPY 1
26
+/* #undef HAVE_MEMPCPY */
27
 
28
 /* Define to 1 if you have a working `mmap' system call. */
29
 #define HAVE_MMAP 1
30
@@ -411,7 +411,7 @@
21
@@ -411,7 +411,7 @@
31
 #define HAVE_SYSCONF 1
22
 #define HAVE_SYSCONF 1
32
 
23
 

Return to bug 257378