* Re: [devel] [~PATCH] percona-xtrabackup.spec
@ 2019-10-17 5:49 ` Евгений Терешков
2019-10-17 6:41 ` Michael Shigorin
0 siblings, 1 reply; 2+ messages in thread
From: Евгений Терешков @ 2019-10-17 5:49 UTC (permalink / raw)
To: Michael Shigorin; +Cc: devel
Michael Shigorin пишет:
> Привет!
> Накропал тут ненужный патчик на percona-xtrabackup --
Увы, оно мне уже некоторое времея не нужно.
Программа ищет маинтайнера. ACL обновил.
--
С уважением, Терешков Евгений.
Jabber ID: evg@altlinux.org, evg_krsk@jabber.ru
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [devel] [~PATCH] percona-xtrabackup.spec
2019-10-17 5:49 ` [devel] [~PATCH] percona-xtrabackup.spec Евгений Терешков
@ 2019-10-17 6:41 ` Michael Shigorin
0 siblings, 0 replies; 2+ messages in thread
From: Michael Shigorin @ 2019-10-17 6:41 UTC (permalink / raw)
To: devel
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
On Thu, Oct 17, 2019 at 12:49:28PM +0700, Евгений Терешков wrote:
> > Накропал тут ненужный патчик на percona-xtrabackup --
> Увы, оно мне уже некоторое времея не нужно.
> Программа ищет маинтайнера. ACL обновил.
Понял; тогда повторю патчик и описание в devel@.
---
Накропал тут ненужный патчик на percona-xtrabackup --
в том смысле, что там дальше более серьёзные проблемы
(do_abi_check.cmake находит разницу ABI), которые пока
решать точно не готов; решил прислать, вдруг сочтёшь
уместным приложить -- этой опции в lcc, судя по баге
mcst#2999, не предвидится (хотя так совпало, что там
настройки как раз такие, которые при ней ожидаются),
поэтому говорят вырезать её и точка (+ещё в MySQL).
---
--
---- WBR, Michael Shigorin / http://altlinux.org
------ http://opennet.ru / http://anna-news.info
[-- Attachment #2: 0001-2.4.12-alt4.patch --]
[-- Type: text/x-patch, Size: 3692 bytes --]
>From 4f76f7c8930853c588fe75b2f877f1c847beea48 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Wed, 16 Oct 2019 14:14:17 +0300
Subject: [PATCH] 2.4.12-alt4
- E2K: avoid lcc-unsupported option
- Minor spec cleanup
---
.gear/percona-xtrabackup.spec | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/.gear/percona-xtrabackup.spec b/.gear/percona-xtrabackup.spec
index 34f5c89..741954f 100644
--- a/.gear/percona-xtrabackup.spec
+++ b/.gear/percona-xtrabackup.spec
@@ -6,17 +6,18 @@
%add_findreq_skiplist %_datadir/xtrabackup-test/*.pl
%add_verify_elf_skiplist %_datadir/xtrabackup-test/lib/My/SafeProcess/my_safe_process
-Summary: XtraBackup online backup for MySQL / InnoDB
Name: percona-xtrabackup
Version: 2.4.12
-Release: alt3
-Group: Databases
+Release: alt4
+
+Summary: XtraBackup online backup for MySQL / InnoDB
License: GPLv2
-Packager: Evgenii Terechkov <evg@altlinux.org>
-Url: https://github.com/percona/percona-xtrabackup.git
+Group: Databases
-Source: %name-%version.tar
+Url: https://github.com/percona/percona-xtrabackup.git
+Source0: %name-%version.tar
Source1: boost.tar
+Packager: Evgenii Terechkov <evg@altlinux.org>
BuildRequires: libaio-devel libgcrypt-devel gcc-c++ cmake bzr bison libtool libncurses-devel zlib-devel python-module-sphinx perl-podlators libev-devel libssl-devel libcurl-devel xxd texlive-latex-base texlive-latex-recommended latexmk liblz4-devel
@@ -25,7 +26,8 @@ BuildRequires: /proc
Requires: perl-podlators rsync
%description
-Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
+Percona XtraBackup is OpenSource online (non-blockable) backup solution
+for InnoDB and XtraDB engines.
%package tests
Summary: XtraBackup online backup for MySQL / InnoDB (testsuite)
@@ -33,12 +35,17 @@ License: GPLv2
Group: Databases
%description tests
-Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
+Percona XtraBackup is OpenSource online (non-blockable) backup solution
+for InnoDB and XtraDB engines.
This subpackage contains testsuite.
%prep
%setup -a1
+%ifarch %e2k
+# lcc 1.23.20 doesn't do that (mcst#2999)
+sed -i 's,-fabi-version=2,,' cmake/build_configurations/compiler_options.cmake
+%endif
%build
cmake \
@@ -63,11 +70,8 @@ popd
%install
mkdir -p %buildroot%_bindir %buildroot%_datadir %buildroot%_man1dir
%makeinstall_std
-
-install -m 644 storage/innobase/xtrabackup/doc/source/build/man/xtrabackup.1 %buildroot%_man1dir
-install -m 644 storage/innobase/xtrabackup/doc/source/build/man/xbcrypt.1 %buildroot%_man1dir
-install -m 644 storage/innobase/xtrabackup/doc/source/build/man/xbstream.1 %buildroot%_man1dir
-install -m 644 storage/innobase/xtrabackup/doc/source/build/man/innobackupex.1 %buildroot%_man1dir
+install -pm 644 storage/innobase/xtrabackup/doc/source/build/man/*.1 \
+ %buildroot%_man1dir
%files
%_bindir/innobackupex
@@ -78,12 +82,16 @@ install -m 644 storage/innobase/xtrabackup/doc/source/build/man/innobackupex.1 %
%_bindir/xbcloud_osenv
%_man1dir/*.1.*
%doc storage/innobase/xtrabackup/contrib/backup_mysql_cron.sh
-%doc storage/innobase/xtrabackup/doc/source/build/latex/PerconaXtraBackup-2.4.pdf
+%doc storage/innobase/xtrabackup/doc/source/build/latex/PerconaXtraBackup-*.pdf
%files tests
%_datadir/xtrabackup-test
%changelog
+* Wed Oct 16 2019 Michael Shigorin <mike@altlinux.org> 2.4.12-alt4
+- E2K: avoid lcc-unsupported option
+- Minor spec cleanup
+
* Tue Mar 26 2019 Terechkov Evgenii <evg@altlinux.org> 2.4.12-alt3
- Build with system-wide liblz4 (ALT#36403)
--
2.10.4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-17 6:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-17 5:49 ` [devel] [~PATCH] percona-xtrabackup.spec Евгений Терешков
2019-10-17 6:41 ` Michael Shigorin
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git