Attachment 227003 Details for Bug 257352 – Patch rev.2

[patch] Patch rev.2

chromium-91.0.4472.164-nasm-build-fix-after-stable13-dba677d13b26_rev2e.diff (text/plain), 1.62 KB, created by Tomoaki AOKI on 2021-08-07 06:18:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomoaki AOKI

Created: 2021-08-07 06:18:11 UTC

Size: 1.62 KB

patch

obsolete

>--- www/chromium/Makefile	2021-07-18 19:51:19.236620000 +0900
>+++ www/chromium/Makefile	2021-08-04 22:50:00.672994000 +0900
>@@ -201,6 +201,11 @@ TEST_ALL_TARGET=	${TEST_TARGETS}
> .include <bsd.port.options.mk>
> .include <bsd.port.pre.mk>
> 
>+BASE_MEMPCPY!=	grep mempcpy ${CROSS_SYSROOT}/usr/include/string.h
>+.if empty(BASE_MEMPCPY)
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-no-mempcpy-nasm
>+.endif
>+
> .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
> IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
> .endif
>
>--- /dev/null
>+++ www/chromium/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-04-14 18:43:05 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
>--- www/chromium/files/patch-third__party_nasm_config_config-linux.h.orig	2021-08-01 08:43:06.762442000 +0900
>+++ www/chromium/files/patch-third__party_nasm_config_config-linux.h	2021-08-06 08:43:06.762442000 +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
>

Actions: View | Diff

Attachments on bug 257352: 226835 | 227003