Date: Tue, 25 Nov 2014 09:57:30 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373396 - head/databases/mariadb55-server Message-ID: <201411250957.sAP9vUfq058634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Nov 25 09:57:29 2014 New Revision: 373396 URL: https://svnweb.freebsd.org/changeset/ports/373396 QAT: https://qat.redports.org/buildarchive/r373396/ Log: databases/mariadb55-server: Fix FreeBSD 8 and 9 (jemallac issue) Bring in MariaDB 10's jemalloc logic to fix FreeBSD 8 and 9. While here, convert to USES+= execinfo PR: 195320 Reported by: FreeBSD 9 users Submitted by: maintainer Final fix by: marino Modified: head/databases/mariadb55-server/Makefile Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Tue Nov 25 08:23:04 2014 (r373395) +++ head/databases/mariadb55-server/Makefile Tue Nov 25 09:57:29 2014 (r373396) @@ -21,7 +21,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client -USES= cmake gmake shebangfix +USES= cmake execinfo gmake shebangfix SHEBANG_FILES= scripts/*.sh NO_OPTIONS_SORT=yes @@ -71,14 +71,10 @@ OPTIONS_DEFAULT+= MAXKEY .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000052 -LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif - -.if ${OSVERSION} < 1000012 -CMAKE_ARGS+= -DWITH_JEMALLOC="bundled" -.else +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" +.else +CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MSSL}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411250957.sAP9vUfq058634>