From owner-svn-ports-all@freebsd.org Sun Oct 27 19:29:51 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DBE51A380C; Sun, 27 Oct 2019 19:29:51 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 471Sbg0Rc3z43Gq; Sun, 27 Oct 2019 19:29:51 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6B9A25DD7; Sun, 27 Oct 2019 19:29:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9RJTobO078516; Sun, 27 Oct 2019 19:29:50 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9RJTog0078515; Sun, 27 Oct 2019 19:29:50 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201910271929.x9RJTog0078515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 27 Oct 2019 19:29:50 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/databases/mariadb101-server: . files X-SVN-Commit-Revision: 515820 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Oct 2019 19:29:51 -0000 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 + # define UT_RELAX_CPU() __ppc_get_timebase() + # else