[packages/xtrabackup] use system jsmn package
glen
glen at pld-linux.org
Sat Jan 2 11:15:05 CET 2016
commit 99c659be1a363a6f908158c6cfa3a89b1a25ac59
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jan 2 12:14:37 2016 +0200
use system jsmn package
jsmn.patch | 18 ++++++++++++++++++
xtrabackup.spec | 7 +++++++
2 files changed, 25 insertions(+)
---
diff --git a/xtrabackup.spec b/xtrabackup.spec
index d7ecd9c..8fc5f5f 100644
--- a/xtrabackup.spec
+++ b/xtrabackup.spec
@@ -10,12 +10,14 @@ License: GPL v2
Group: Applications/Databases
Source0: https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-%{version}/source/tarball/percona-%{name}-%{version}.tar.gz
# Source0-md5: eb2c006a75b5099665f04a54211fe8d5
+Patch0: jsmn.patch
URL: http://www.percona.com/doc/percona-xtrabackup/
BuildRequires: bash
BuildRequires: cmake >= 2.6
BuildRequires: acl-devel
BuildRequires: curl-devel
BuildRequires: expat-devel
+BuildRequires: jsmn-devel
BuildRequires: gnupg
BuildRequires: libaio-devel
BuildRequires: libarchive-devel
@@ -46,6 +48,10 @@ server and backing up MyISAM tables.
%prep
%setup -q -n percona-%{name}-%{version}
+%patch0 -p1
+
+# use system package
+mv storage/innobase/xtrabackup/src/jsmn .
%build
install -d build
@@ -59,6 +65,7 @@ cd build
-DWITH_PIC=ON \
-DWITH_READLINE=system \
-DWITH_ZLIB=system \
+ -DWITH_SSL=system \
..
%{__make}
diff --git a/jsmn.patch b/jsmn.patch
new file mode 100644
index 0000000..bc9c4cb
--- /dev/null
+++ b/jsmn.patch
@@ -0,0 +1,18 @@
+--- percona-xtrabackup-2.3.3/./storage/innobase/xtrabackup/src/CMakeLists.txt~ 2015-12-14 21:49:07.000000000 +0200
++++ percona-xtrabackup-2.3.3/./storage/innobase/xtrabackup/src/CMakeLists.txt 2016-01-02 01:20:57.242088388 +0200
+@@ -18,7 +18,6 @@
+ INCLUDE(libev)
+
+ ADD_SUBDIRECTORY(libarchive)
+-ADD_SUBDIRECTORY(jsmn)
+
+ FIND_GCRYPT()
+ FIND_CURL()
+@@ -37,7 +36,6 @@
+ ${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/libarchive/libarchive
+ ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/quicklz
+- ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/jsmn
+ ${GCRYPT_INCLUDE_DIR}
+ ${CURL_INCLUDE_DIRS}
+ ${LIBEV_INCLUDE_DIRS}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xtrabackup.git/commitdiff/99c659be1a363a6f908158c6cfa3a89b1a25ac59
More information about the pld-cvs-commit
mailing list