Build with mariadb-connector-c
This commit is contained in:
Honza Horak
parent
3986a31662
commit
34b1fbd85d
128
apr-util-mariadb-upstream.patch
Normal file
128
apr-util-mariadb-upstream.patch
Normal file
@ -0,0 +1,128 @@
|
||||
Upstream patch for building with mariadb:
|
||||
Taken from https://bz.apache.org/bugzilla/show_bug.cgi?id=61517
|
||||
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1494093
|
||||
|
||||
--- a/build/dbd.m4 2017-05-03 19:18:52.000000000 -0400
|
||||
+++ a/build/dbd.m4 2017-09-13 16:58:07.369546391 -0400
|
||||
@@ -163,10 +163,15 @@
|
||||
old_cppflags="$CPPFLAGS"
|
||||
old_ldflags="$LDFLAGS"
|
||||
|
||||
+ my_library="mysqlclient"
|
||||
+
|
||||
AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
|
||||
[
|
||||
if test "$withval" = "yes"; then
|
||||
AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
|
||||
+ if test "x$MYSQL_CONFIG" = "x"; then
|
||||
+ AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config])
|
||||
+ fi
|
||||
if test "x$MYSQL_CONFIG" != 'x'; then
|
||||
mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
|
||||
mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
|
||||
@@ -174,32 +179,40 @@
|
||||
|
||||
APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
|
||||
APR_ADDTO(LIBS, [$mysql_LIBS])
|
||||
+
|
||||
+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
|
||||
+ my_library="mariadb"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
|
||||
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
|
||||
- [apu_have_mysql=0; break],
|
||||
- [#include <my_global.h>])
|
||||
- if test "$apu_have_mysql" = "0"; then
|
||||
- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
|
||||
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
|
||||
- [apu_have_mysql=0; break],
|
||||
- [#include <mysql/my_global.h>])
|
||||
+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
|
||||
+ if test "$apr_have_mysql" = "0"; then
|
||||
+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
|
||||
fi
|
||||
- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
|
||||
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
|
||||
+ if test "$apr_have_mysql" = "1"; then
|
||||
+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
|
||||
+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
|
||||
+ fi
|
||||
+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
|
||||
+ APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
|
||||
fi
|
||||
elif test "$withval" = "no"; then
|
||||
:
|
||||
else
|
||||
AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
|
||||
+ if test "x$MYSQL_CONFIG" = "x"; then
|
||||
+ AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config],,[$withval/bin])
|
||||
+ fi
|
||||
if test "x$MYSQL_CONFIG" != 'x'; then
|
||||
- mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
|
||||
- mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
|
||||
- mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
|
||||
+ mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
|
||||
+ mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
|
||||
+ mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
|
||||
+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
|
||||
+ my_library="mariadb"
|
||||
+ fi
|
||||
else
|
||||
- mysql_CPPFLAGS="-I$withval/include"
|
||||
- mysql_LDFLAGS="-L$withval/lib "
|
||||
+ mysql_CPPFLAGS="-I$withval/include"
|
||||
+ mysql_LDFLAGS="-L$withval/lib "
|
||||
fi
|
||||
|
||||
APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
|
||||
@@ -207,18 +220,15 @@
|
||||
APR_ADDTO(LIBS, [$mysql_LIBS])
|
||||
|
||||
AC_MSG_NOTICE(checking for mysql in $withval)
|
||||
- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
|
||||
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
|
||||
- [apu_have_mysql=0; break],
|
||||
- [#include <my_global.h>])
|
||||
-
|
||||
- if test "$apu_have_mysql" != "1"; then
|
||||
- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
|
||||
- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
|
||||
- [apu_have_mysql=0; break],
|
||||
- [#include <mysql/my_global.h>])
|
||||
+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
|
||||
+ if test "$apr_have_mysql" = "0"; then
|
||||
+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
|
||||
+ fi
|
||||
+ if test "$apr_have_mysql" = "1"; then
|
||||
+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
|
||||
+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
|
||||
fi
|
||||
- if test "$apu_have_mysql" != "0"; then
|
||||
+ if test "$apu_have_mysql" = "1"; then
|
||||
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
|
||||
fi
|
||||
fi
|
||||
@@ -229,7 +239,7 @@
|
||||
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
|
||||
dnl we know the library is there.
|
||||
if test "$apu_have_mysql" = "1"; then
|
||||
- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS])
|
||||
+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS])
|
||||
fi
|
||||
AC_SUBST(LDADD_dbd_mysql)
|
||||
|
||||
--- a/dbd/apr_dbd_mysql.c 2017-05-03 19:18:52.000000000 -0400
|
||||
+++ a/dbd/apr_dbd_mysql.c 2017-09-13 19:15:20.894368809 -0400
|
||||
@@ -1262,7 +1262,9 @@
|
||||
|
||||
static void dbd_mysql_init(apr_pool_t *pool)
|
||||
{
|
||||
+#if MYSQL_VERSION_ID < 100000
|
||||
my_init();
|
||||
+#endif
|
||||
mysql_thread_init();
|
||||
|
||||
/* FIXME: this is a guess; find out what it really does */
|
||||
|
||||
@ -16,13 +16,14 @@
|
||||
Summary: Apache Portable Runtime Utility library
|
||||
Name: apr-util
|
||||
Version: 1.6.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: ASL 2.0
|
||||
Group: System Environment/Libraries
|
||||
URL: http://apr.apache.org/
|
||||
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
|
||||
Patch1: apr-util-1.2.7-pkgconf.patch
|
||||
Patch4: apr-util-1.4.1-private.patch
|
||||
Patch5: apr-util-mariadb-upstream.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: autoconf, apr-devel >= 1.3.0
|
||||
BuildRequires: %{dbdep}, expat-devel, libuuid-devel
|
||||
@ -71,7 +72,7 @@ DBM (database abstraction) interface.
|
||||
%package mysql
|
||||
Group: Development/Libraries
|
||||
Summary: APR utility library MySQL DBD driver
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: mariadb-connector-c-devel
|
||||
Requires: apr-util%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description mysql
|
||||
@ -131,6 +132,7 @@ This package provides the NSS crypto support for the apr-util.
|
||||
%setup -q
|
||||
%patch1 -p1 -b .pkgconf
|
||||
%patch4 -p1 -b .private
|
||||
%patch5 -p1 -b .maria
|
||||
|
||||
%build
|
||||
autoheader && autoconf
|
||||
@ -240,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/aclocal/*.m4
|
||||
|
||||
%changelog
|
||||
* Tue Dec 19 2017 Honza Horak <hhorak@redhat.com> - 1.6.1-2
|
||||
- Build with mariadb-connector-c
|
||||
|
||||
* Wed Oct 25 2017 Luboš Uhliarik <luhliari@redhat.com> - 1.6.1-1
|
||||
- new version 1.6.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user