Re: [update] mariadb-10.3.14

Hi,

Thanks again for taking care of it!

> On Tue, May 14 2019, Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:
> > On Mon, May 13 2019, Jeremie Courreges-Anglas <jca@wxcvbn.org>
> > wrote:
> >> Now that 10.2 has been committed, here's an update to the latest.
> >> Upstream removed the example config file so I decided to create one
> >> based on
> >>
> >> https://mariadb.com/kb/en/library/configuring-mariadb-with-option-files/
> >>
> >> No symbol change in the SHARED_LIBS. The diff also includes a fix
> >> for the test target (mysql-test tests don't finish here).
> >>
> >> Looking for real use reports and oks.
> >
> > no_server doesn't build any more because my_global.h file is
> > missing, so I'm holding off for now. Test reports still welcome.
>
> bah, I'm not sure why breaking the no_server PSEUDO_FLAVOR would
> matter. The problem is known upstream and I worked around it in the
> diff below.
>
> https://jira.mariadb.org/browse/MDEV-19152
>
> Meanwhile, cwen@ reported that mariadb-10.2.23 doesn't build on
> powerpc because it's lacking __sync_* atomics. 10.3.x switched to
> __atomic_* builtins which are better supported by gcc-8.3.0, this
> fixes mariadb on powerpc according to cwen's tests (thanks!).

I've retested your diff and met no issues at all.

Please note that it also needs the infamous atomics block - they
provide proper atomics detection... but no -latomic flag test.

I'm sending a diff of the Makefile, but you know very well what i'm
talking about ;)

> So here's a refreshed diff. The test target is still kinda broken, so
> real use reports would be nice.
>
> Brad, still ok?

Charlène.


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- Makefile 20 May 2019 10:31:23 -0000 1.77
+++ Makefile 25 May 2019 20:29:02 -0000
@@ -7,7 +7,7 @@ COMMENT-main= multithreaded SQL database
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)

-VERSION= 10.2.23
+VERSION= 10.3.14
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
@@ -46,7 +46,7 @@ BUILD_DEPENDS= devel/bison

LIB_DEPENDS-main= ${LIB_DEPENDS} \
converters/libiconv
-RUN_DEPENDS-server= ${BASE_PKGPATH},-main>=10.2v1,<10.3v1 \
+RUN_DEPENDS-server= ${BASE_PKGPATH},-main>=10.3v1,<10.4v1 \
databases/p5-DBD-mysql
LIB_DEPENDS-server= ${LIB_DEPENDS} \
archivers/bzip2 \
@@ -56,7 +56,7 @@ LIB_DEPENDS-server= ${LIB_DEPENDS} \
archivers/xz \
converters/libiconv \
devel/pcre
-RUN_DEPENDS-tests= ${BASE_PKGPATH},-main>=10.2v1,<10.3v1
+RUN_DEPENDS-tests= ${BASE_PKGPATH},-main>=10.3v1,<10.4v1
LIB_DEPENDS-tests= ${LIB_DEPENDS} \
converters/libiconv \
devel/pcre
@@ -115,6 +115,11 @@ CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib

+.if ${MACHINE_ARCH} == "powerpc"
+LDFLAGS += -latomic
+WANTLIB += atomic
+.endif
+
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"

MULTI_PACKAGES= -main -server -tests
@@ -143,10 +148,12 @@ post-install:
cd mysql && \
ln -sf libmariadb.so.${LIBmariadb_VERSION} libmysqlclient.so.${LIBmysqlclient_VERSION} && \
ln -sf libmariadb.so.${LIBmariadb_VERSION} libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}
+ ${INSTALL_DATA} ${FILESDIR}/my.cnf ${PREFIX}/share/examples/mysql/
rm -Rf ${PREFIX}/share/mysql-test/plugin/rocksdb/

.if ${BUILD_PACKAGES:M-tests}
do-test:
+ (${MODCMAKE_TEST_TARGET}) || true # Keep on going even if regress tests fail
@cd ${WRKBUILD}/mysql-test && ./mysql-test-run.pl --force --verbose --max-test-fail=0
.else
NO_TEST= Yes