From d3da5b4c5af7ad9550a7521031f2546e3c645d7c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 4 Nov 2014 10:34:48 +0000 Subject: main/xtrabackup: fix build work around -Werror --- main/xtrabackup/APKBUILD | 22 ++++++++++++++++++---- main/xtrabackup/Werror.patch | 11 +++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 main/xtrabackup/Werror.patch (limited to 'main/xtrabackup') diff --git a/main/xtrabackup/APKBUILD b/main/xtrabackup/APKBUILD index eb015d36f2..b2444f59e7 100644 --- a/main/xtrabackup/APKBUILD +++ b/main/xtrabackup/APKBUILD @@ -9,7 +9,18 @@ url='http://www.percona.com/software/percona-xtrabackup/' license='GPL' makedepends='bash bison cmake ncurses-dev libaio-dev libgcrypt-dev py-setuptools py-sphinx zlib-dev' -source="http://percona.com/redir/downloads/XtraBackup/XtraBackup-$pkgver/source/percona-xtrabackup-$pkgver.tar.gz" +source="http://percona.com/redir/downloads/XtraBackup/XtraBackup-$pkgver/source/percona-xtrabackup-$pkgver.tar.gz + Werror.patch + " + +prepare() { + cd "$srcdir"/percona-xtrabackup-$pkgver + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { cd "$srcdir"/percona-xtrabackup-$pkgver @@ -27,6 +38,9 @@ package() { ln -s /usr/bin/xtrabackup_55 "$pkgdir"/usr/bin/xtrabackup } -md5sums="c36df9d65e07b292e1e63372d8a4bdec percona-xtrabackup-2.1.8.tar.gz" -sha256sums="2a397372aaa42228b48e74b89c41265d0b0c4be815069a86feb855bc8fbf2ffa percona-xtrabackup-2.1.8.tar.gz" -sha512sums="f2c22575fa789335f08e8d0fab493305864ca6c01ecf7078620f0ac676348287de908304975ba81a66cb91bdf3604b50d65d84ac7073d420feada72d34fc8cd4 percona-xtrabackup-2.1.8.tar.gz" +md5sums="c36df9d65e07b292e1e63372d8a4bdec percona-xtrabackup-2.1.8.tar.gz +fe4760511ec877b2756db8581fad60c5 Werror.patch" +sha256sums="2a397372aaa42228b48e74b89c41265d0b0c4be815069a86feb855bc8fbf2ffa percona-xtrabackup-2.1.8.tar.gz +12e8154a84c28dd32895001ffbd0171f6d6c1a12b803dc69c51dd55a848c13d7 Werror.patch" +sha512sums="f2c22575fa789335f08e8d0fab493305864ca6c01ecf7078620f0ac676348287de908304975ba81a66cb91bdf3604b50d65d84ac7073d420feada72d34fc8cd4 percona-xtrabackup-2.1.8.tar.gz +99a1b7fc935b2779ce52401de68f9218c55e43a4ffebbfe8c47c384b4847e4690cbb7cf349ba47b5c2b6d4bf53db231fa74d77b3bdd83d043a7aefdf6edac2d9 Werror.patch" diff --git a/main/xtrabackup/Werror.patch b/main/xtrabackup/Werror.patch new file mode 100644 index 0000000000..ae94f09878 --- /dev/null +++ b/main/xtrabackup/Werror.patch @@ -0,0 +1,11 @@ +--- ./src/libarchive/CMakeLists.txt.orig ++++ ./src/libarchive/CMakeLists.txt +@@ -843,7 +843,7 @@ + # aggressive about diagnosing build problems; this can get + # relaxed somewhat in final shipping versions. + IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$") +- ADD_DEFINITIONS(-Wall -Werror) ++ ADD_DEFINITIONS(-Wall) + ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$") + + IF(ENABLE_TEST) -- cgit v1.2.3