svn commit: r527392 - in branches/2020Q1/databases/mysql80-server: . files

[Jochen Neumeister]

Author: joneum
Date: Fri Feb 28 22:07:00 2020
New Revision: 527392
URL: https://svnweb.freebsd.org/changeset/ports/527392

Log:
  MFH: r527391
  
  Fix build on non-x86 and nun-aarch6
  
  PR:		244073
  Submitted by:	pkubaj
  Sponsored by:	Netzkommune GmbH
  
  Approved by:	ports-secteam (joneum)

Added:
  branches/2020Q1/databases/mysql80-server/files/patch-include_my__stacktrace.h
     - copied unchanged from r527391, head/databases/mysql80-server/files/patch-include_my__stacktrace.h
Modified:
  branches/2020Q1/databases/mysql80-server/Makefile
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/databases/mysql80-server/Makefile
==============================================================================
--- branches/2020Q1/databases/mysql80-server/Makefile	Fri Feb 28 22:04:41 2020	(r527391)
+++ branches/2020Q1/databases/mysql80-server/Makefile	Fri Feb 28 22:07:00 2020	(r527392)
@@ -32,10 +32,16 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd \
 		libprotobuf.so:devel/protobuf \
-		libunwind.so:devel/libunwind
+		${LIB_DEPENDS_${ARCH}}
+LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 
 BUILD_DEPENDS=	liblz4>0:archivers/liblz4 \
-		libunwind>0:devel/libunwind
+		${BUILD_DEPENDS_${ARCH}}
+BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_i386=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC

Copied: branches/2020Q1/databases/mysql80-server/files/patch-include_my__stacktrace.h (from r527391, head/databases/mysql80-server/files/patch-include_my__stacktrace.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/databases/mysql80-server/files/patch-include_my__stacktrace.h	Fri Feb 28 22:07:00 2020	(r527392, copy of r527391, head/databases/mysql80-server/files/patch-include_my__stacktrace.h)
@@ -0,0 +1,11 @@
+--- include/my_stacktrace.h.orig	2020-01-23 19:43:07.769584000 +0100
++++ include/my_stacktrace.h	2020-01-23 19:43:48.684042000 +0100
+@@ -43,7 +43,7 @@
+   HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris
+   _WIN32 - Windows
+ */
+-#if defined(HAVE_BACKTRACE) || defined(_WIN32)
++#if (defined(HAVE_BACKTRACE) || defined(_WIN32)) && (defined(__aarch64__) || defined(__amd64__) || defined(__i386__))
+ #define HAVE_STACKTRACE 1
+ void my_init_stacktrace();
+ void my_print_stacktrace(uchar *stack_bottom, ulong thread_stack);