Package init
This commit is contained in:
overweight
commit
1a01f075f2
@ -0,0 +1,71 @@
|
||||
From 051748825e77172677d9e3b319b870c3c0a70a38 Mon Sep 17 00:00:00 2001
|
||||
From: Jitka Plesnikova <jplesnik@redhat.com>
|
||||
Date: Fri, 14 Jul 2017 14:13:50 +0200
|
||||
Subject: [PATCH] Fix build failures for MariaDB 10.2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
<mariadb_version.h> does not exist in mariadb-5.5.26. Do not include
|
||||
it explicitly. Instead rely on including <mysql.h> that transitively
|
||||
includes <mariadb_version.h> or <mysql_version.h>. This makes this
|
||||
patch more portable.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
dbdimp.c | 7 +++++++
|
||||
mysql.xs | 4 ++--
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
# Fixed in 4.045
|
||||
#diff --git a/dbdimp.c b/dbdimp.c
|
||||
#index 71251da..97fa9c4 100644
|
||||
#--- a/dbdimp.c
|
||||
#+++ b/dbdimp.c
|
||||
#@@ -2104,6 +2104,9 @@ MYSQL *mysql_dr_connect(
|
||||
#
|
||||
# if (result)
|
||||
# {
|
||||
#+#if MYSQL_VERSION_ID >= 50013
|
||||
#+ my_bool reconnect= 1;
|
||||
#+#endif
|
||||
# #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
|
||||
# /* connection succeeded. */
|
||||
# /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs
|
||||
#@@ -2122,7 +2125,11 @@ MYSQL *mysql_dr_connect(
|
||||
# we turn off Mysql's auto reconnect and handle re-connecting ourselves
|
||||
# so that we can keep track of when this happens.
|
||||
# */
|
||||
#+#if MYSQL_VERSION_ID >= 50013
|
||||
#+ mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect);
|
||||
#+#else
|
||||
# result->reconnect=0;
|
||||
#+#endif
|
||||
# }
|
||||
# else {
|
||||
# /*
|
||||
diff --git a/mysql.xs b/mysql.xs
|
||||
index 60cf9c6..750c763 100644
|
||||
--- a/mysql.xs
|
||||
+++ b/mysql.xs
|
||||
@@ -787,7 +787,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
|
||||
D_imp_dbh(dbh);
|
||||
IV type = 0;
|
||||
SV* retsv=NULL;
|
||||
-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
|
||||
+#if MYSQL_VERSION_ID >= 50709
|
||||
/* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
|
||||
IV buffer_len;
|
||||
#endif
|
||||
@@ -819,7 +819,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
|
||||
retsv = newSVpvn("`", 1);
|
||||
break;
|
||||
case SQL_MAXIMUM_STATEMENT_LENGTH:
|
||||
-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
|
||||
+#if MYSQL_VERSION_ID >= 50709
|
||||
/* MariaDB 10 is not MySQL source level compatible so this
|
||||
only applies to MySQL*/
|
||||
/* mysql_get_option() was added in mysql 5.7.3 */
|
||||
--
|
||||
2.13.6
|
||||
|
||||
BIN
DBD-mysql-4.046.tar.gz
Normal file
BIN
DBD-mysql-4.046.tar.gz
Normal file
Binary file not shown.
74
perl-DBD-MySQL.spec
Normal file
74
perl-DBD-MySQL.spec
Normal file
@ -0,0 +1,74 @@
|
||||
Name: perl-DBD-MySQL
|
||||
Version: 4.046
|
||||
Release: 5
|
||||
Summary: Perl [DBI] driver for access to MySQL databases.
|
||||
License: GPL+ or Artistic
|
||||
URL: https://metacpan.org/release/DBD-mysql
|
||||
Source0: https://cpan.metacpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz
|
||||
|
||||
Patch0: 0000-DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch
|
||||
BuildRequires: coreutils findutils gcc mariadb-connector-c mariadb-connector-c-devel openssl-devel perl-devel
|
||||
BuildRequires: perl-generators perl-interpreter zlib-devel perl perl-macros perl-interpreter perl-File-Path
|
||||
BuildRequires: perl-PathTools perl-Getopt-Long perl-libs perl-ExtUtils-MakeMaker perl-Data-Dumper git
|
||||
BuildRequires: perl(DBI) >= 1.609
|
||||
BuildRequires: perl(DBI::DBD)
|
||||
BuildRequires: perl(Devel::CheckLib) >= 1.09
|
||||
BuildRequires: perl(Test::Deep)
|
||||
BuildRequires: perl(Test::Simple) >= 0.90
|
||||
Requires: perl-libs
|
||||
Provides: perl-DBD-mysql = %{version}-%{release}
|
||||
|
||||
%{?perl_default_filter}
|
||||
|
||||
%description
|
||||
DBD::mysql is the Perl5 Database Interface driver for the MySQL database. In other words: DBD::mysql is an
|
||||
interface between the Perl programming language and the MySQL programming API that comes with the MySQL
|
||||
relational database management system. Most functions provided by this programming API are supported. Some
|
||||
rarely used functions are missing, mainly because no-one ever requested them.
|
||||
|
||||
%package help
|
||||
Summary: Including man files for perl-DBD-MySQL
|
||||
Requires: man
|
||||
|
||||
%description help
|
||||
This contains man files for the using of perl-DBD-MySQL.
|
||||
|
||||
%prep
|
||||
%autosetup -Sgit -n DBD-mysql-%{version}
|
||||
find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make pure_install DESTDIR=%{buildroot}
|
||||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
%check
|
||||
make test
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc Changes README.md
|
||||
%{perl_vendorarch}/*
|
||||
|
||||
%files help
|
||||
%{_mandir}/man3/*.3*
|
||||
|
||||
%changelog
|
||||
* Sat Aug 31 2019 zoujing<zoujing13@huawei.com> - 4.064-5
|
||||
- Type:enhancemnet
|
||||
- ID:NA
|
||||
- SUG:restart
|
||||
- DESCi:openEuler Debranding
|
||||
|
||||
* Wed Aug 21 2019 renxudong<renxudong1@huawei.com> - 4.064-4.1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:revise patch name
|
||||
|
||||
* Wed Jul 18 2018 openEuler Buildteam <buildteam@openeuler.org> - 4.046-4
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user