Page MenuHomeFreeBSD
Differential D2771 Diff 7499 databases/mariadb100-server/Makefile

Changeset View

Standalone View

View Options

databases/mariadb100-server/Makefile

# $FreeBSD$ # $FreeBSD$
PORTNAME?= mariadb PORTNAME?= mariadb
PORTVERSION= 10.0.17 PORTVERSION= 10.0.20
CATEGORIES= databases ipv6 CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \
http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \
http://mirror.switch.ch/mirror/${SITESDIR}/ http://mirror.switch.ch/mirror/${SITESDIR}/
PKGNAMESUFFIX?= 100-server PKGNAMESUFFIX?= 100-server
MAINTAINER= spil.oss@gmail.com MAINTAINER= brnrd@FreeBSD.org
vsevolodUnsubmitted
Done
Inline Actions

You should also use your FreeBSD address (and update that for all your ports as a single commit preferably).

vsevolod: You should also use your FreeBSD address (and update that for all your ports as a single commit…
vsevolodUnsubmitted
Done
Inline Actions

Could you create a separate commit that would update all ports you maintain simultaneously?

vsevolod: Could you create a separate commit that would update all ports you maintain simultaneously?
brnrdAuthorUnsubmitted
Done
Inline Actions

The only other port I'm the maintainer for is mariadb-server/client. That would now only be possible using a separate tree I'd guess. Any pointers?

brnrd: The only other port I'm the maintainer for is mariadb-server/client. That would now only be…
junovitchUnsubmitted
Done
Inline Actions

A minor pedantic note but one worth adding out since the spelling needs to corrected anyway... The proper capitalization would be '@FreeBSD.org' vice the lower case '@freebsd.org'. The lower case has only shows up 5 times in ports while the proper capitalization shows up 19987 times.

junovitch: A minor pedantic note but one worth adding out since the spelling needs to corrected anyway...
koobsUnsubmitted
Done
Inline Actions

+1

koobs: +1
COMMENT?= Multithreaded SQL database (server) COMMENT?= Multithreaded SQL database (server)
LICENSE= GPLv2 LICENSE= GPLv2
SUB_FILES= pkg-message SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message
SLAVEDIRS= databases/mariadb100-client SLAVEDIRS= databases/mariadb100-client
USES= bison:build cmake execinfo gmake shebangfix cpe USES= bison:build cmake execinfo gmake shebangfix cpe
# USE_LDCONFIG= ${PREFIX}/lib/mysql # install conflict
koobsUnsubmitted
Not Done
Inline Actions
  1. Leaving commented entry in?
  2. If this port provides a library then afaik USE_LDCONFIG is a requirement
  3. What is the conflict if each of -client and -server ports install unique files in the directory? If it's the directory itself, dont @dir entries in the pkg-plist handle this already? I would get advice from portmgr on this and (2).
koobs: # Leaving commented entry in? # If this port provides a library then afaik USE_LDCONFIG is…
SHEBANG_FILES= scripts/*.sh SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source SITESDIR= mariadb/mariadb-${PORTVERSION}/source
BROKEN_armv6= Does not compile on arm
OPTIONS_DEFINE= FASTMTX OPTIONS_DEFINE= FASTMTX
koobsUnsubmitted
Done
Inline Actions

Description says 'arm', but BROKEN only checks armv6, what about other ARM versions? Update either BROKEN_* to cover them, or update description to be specific about which versions are BROKEN.

koobs: Description says 'arm', but BROKEN only checks armv6, what about other ARM versions? Update…
brnrdAuthorUnsubmitted
Not Done
Inline Actions

Seems I added this myself for 5.5.41 but can't find any references as to why this would indeed be broken.

brnrd: Seems I added this myself for 5.5.41 but can't find any references as to why this would indeed…
OPTIONS_RADIO= SSL OPTIONS_RADIO= SSL
OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL
OPTIONS_DEFAULT+= OPENSSL OPTIONS_DEFAULT+= OPENSSL
NO_OPTIONS_SORT= yes NO_OPTIONS_SORT= yes
BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL
FASTMTX_DESC= Replace mutexes with spinlocks FASTMTX_DESC= Replace mutexes with spinlocks
WITHOUT_SSL_DESC= No SSL/TLS support WITHOUT_SSL_DESC= No SSL/TLS support
Show All 13 LinesCMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_SHAREDIR="share" \ -DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR= \ -DINSTALL_SQLBENCHDIR= \
-DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \
-DWITH_UNIT_TESTS=0 \ -DWITH_UNIT_TESTS=0 \
-DWITH_LIBEDIT=0 \ -DWITH_LIBEDIT=0 \
-DWITH_LIBWRAP=1 \ -DWITH_LIBWRAP=1 \
-DEXECINFO_ROOT=${LOCALBASE} \ -DEXECINFO_ROOT=${LOCALBASE} \
-DCOMPILATION_COMMENT="FreeBSD Ports" -DCOMPILATION_COMMENT="FreeBSD Ports"
.ifdef USE_MYSQL
.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
DATADIR= ${PREFIX}/share/mysql DATADIR= ${PREFIX}/share/mysql
koobsUnsubmitted
Done
Inline Actions

Could this be moved to sanity.mk given it looks like a deprecation check/warning?

If so, other MySQL/MariaDB ports should do the same. You could submit these changes in a separate revision

If not, then the message should be rewritten to explain not just that the variable is set, but why setting it is not a good thing, not required, deprecated, or whatever

koobs: Could this be moved to sanity.mk given it looks like a deprecation check/warning? If so, other…
brnrdAuthorUnsubmitted
Not Done
Inline Actions

Dates back to 2003 https://bugs.freebsd.org/56252
Can't reproduce that behaviour, remove

brnrd: Dates back to 2003 https://bugs.freebsd.org/56252 Can't reproduce that behaviour, remove
brnrdAuthorUnsubmitted
Not Done
Inline Actions

Found the reason. Problem is a circular dep in -client when USE_MYSQL is installed.

brnrd: Found the reason. Problem is a circular dep in -client when USE_MYSQL is installed.
.if !defined(CLIENT_ONLY) .if !defined(CLIENT_ONLY)
# MySQL-Server options # MySQL-Server options
USE_MYSQL= yes
OPTIONS_DEFINE+= INNODB MAXKEY MROONGA OQGRAPH OPTIONS_DEFINE+= INNODB MAXKEY MROONGA OQGRAPH
OPTIONS_DEFAULT+= MAXKEY OPTIONS_DEFAULT+= MAXKEY
OPTIONS_SUB= yes OPTIONS_SUB= yes
INNODB_DESC= Build InnoDB engine next to XtraDB INNODB_DESC= Build InnoDB engine next to XtraDB
MAXKEY_DESC= Change max key length from 1000 to 4000 MAXKEY_DESC= Change max key length from 1000 to 4000
MROONGA_DESC= Mroonga Full Text Search engine (gcc) MROONGA_DESC= Mroonga Full Text Search engine (gcc)
OQGRAPH_DESC= Open Query Graph Computation engine (gcc) OQGRAPH_DESC= Open Query Graph Computation engine (gcc)
Show All 20 Lines
USE_RC_SUBR= mysql-server USE_RC_SUBR= mysql-server
USERS= mysql USERS= mysql
GROUPS= mysql GROUPS= mysql
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
-DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1 INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1
OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1 OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1
OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \
libJudy.so:${PORTSDIR}/devel/judy
post-install: post-install:
# Remove programs to avoid conflict with mariadb100-client # Remove programs to avoid conflict with mariadb100-client
# These are "client" components, so there should be a switch that # These are "client" components, so there should be a switch that
# prevents them from being installed but it's unknown right now # prevents them from being installed but it's unknown right now
${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_config \
${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
${STAGEDIR}${PREFIX}/bin/mysqlaccess ${STAGEDIR}${PREFIX}/bin/mysqlaccess
.endif .endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
CMAKE_ARGS+= -DWITH_JEMALLOC="system" CMAKE_ARGS+= -DWITH_JEMALLOC="system"
.else .else
CMAKE_ARGS+= -DWITH_JEMALLOC="no" CMAKE_ARGS+= -DWITH_JEMALLOC="no"
.endif .endif
# Server segfaults on i386 when built with clang >= 3.4 # Server segfaults on i386 when built with clang >= 3.4
.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 .if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000
USE_GCC= yes USE_GCC= yes
.endif
.if ${PORT_OPTIONS:MOQGRPAH}
IGNORE= currently MariaDB doesn't build correctly with OQGraph \
koobsUnsubmitted
Not Done
Inline Actions

I looked for a <OPT>_IGNORE helper in bsd.options.mk but couldnt see one. I was going to suggest using a helper here instead. We should create an <OPT>_IGNORE if its doable. You can create a new revision for this

koobs: I looked for a <OPT>_IGNORE helper in bsd.options.mk but couldnt see one. I was going to…
See https://mariadb.atlassian.net/browse/MDEV-8128.
.endif .endif
post-patch: post-patch:
@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
.if ${OPSYS} == DragonFly .if ${OPSYS} == DragonFly
${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
${WRKSRC}/cmake/os/DragonFly.cmake ${WRKSRC}/cmake/os/DragonFly.cmake
${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb
.endif .endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>