Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Oct 2019 19:29:50 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r515820 - in head/databases/mariadb101-server: . files
Message-ID:  <201910271929.x9RJTog0078515@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Sun Oct 27 19:29:50 2019
New Revision: 515820
URL: https://svnweb.freebsd.org/changeset/ports/515820

Log:
  databases/mariadb101-server: fix build on powerpc*
  
  Follow what mariadb102 and newer do and don't include glibc-related headers. Fixes build on powerpc*.
  
  PR:		241146
  Approved by:	brnrd (maintainer timeout), linimon (mentor)

Added:
  head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h   (contents, props changed)
Modified:
  head/databases/mariadb101-server/Makefile

Modified: head/databases/mariadb101-server/Makefile
==============================================================================
--- head/databases/mariadb101-server/Makefile	Sun Oct 27 19:27:50 2019	(r515819)
+++ head/databases/mariadb101-server/Makefile	Sun Oct 27 19:29:50 2019	(r515820)
@@ -111,7 +111,6 @@ CMAKE_ON+=	WITHOUT_SERVER
 GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
 .else
 # MySQL-Server part
-BROKEN_powerpc64=	Does not build: fatal error: sys/platform/ppc.h: No such file or directory
 USES+=		mysql:101m
 USE_GNOME=	libxml2
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin

Added: head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h	Sun Oct 27 19:29:50 2019	(r515820)
@@ -0,0 +1,11 @@
+--- storage/xtradb/include/ut0ut.h.orig	2019-10-08 20:51:54 UTC
++++ storage/xtradb/include/ut0ut.h
+@@ -83,7 +83,7 @@ struct ut_when_dtor { (private)
+    the YieldProcessor macro defined in WinNT.h. It is a CPU architecture-
+    independent way by using YieldProcessor. */
+ #  define UT_RELAX_CPU() YieldProcessor()
+-# elif defined(__powerpc__)
++# elif defined(__powerpc__) && defined __GLIBC__
+ #include <sys/platform/ppc.h>
+ #  define UT_RELAX_CPU() __ppc_get_timebase()
+ # else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910271929.x9RJTog0078515>