diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2014-03-19 00:52:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2014-03-19 00:52:45 +0000 |
| commit | cbdc6abc5703d017a9a4fa69002fc1feaca29cef (patch) | |
| tree | 32c5f1e97c148cbccad4f96277b8efb11ab90b5c /dev-db | |
| parent | Increase EAPI to 5 (diff) | |
| download | gentoo-2-cbdc6abc5703d017a9a4fa69002fc1feaca29cef.tar.gz gentoo-2-cbdc6abc5703d017a9a4fa69002fc1feaca29cef.tar.bz2 gentoo-2-cbdc6abc5703d017a9a4fa69002fc1feaca29cef.zip | |
remove -Werror flag wrt #494332
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql-5.5.32-Werror.patch | 15 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-5.5.32.ebuild | 11 |
3 files changed, 29 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 237a9d53d6f7..b90c42686163 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.664 2013/08/29 14:40:17 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.665 2014/03/19 00:52:45 hasufell Exp $ + + 19 Mar 2014; Julian Ospald <hasufell@gentoo.org> mysql-5.5.32.ebuild, + +files/mysql-5.5.32-Werror.patch: + remove -Werror flag wrt #494332 29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> -mysql-5.1.66-r1.ebuild, -mysql-5.1.66.ebuild, -mysql-5.1.67-r1.ebuild, -mysql-5.1.67.ebuild, diff --git a/dev-db/mysql/files/mysql-5.5.32-Werror.patch b/dev-db/mysql/files/mysql-5.5.32-Werror.patch new file mode 100644 index 000000000000..157eabf8793e --- /dev/null +++ b/dev-db/mysql/files/mysql-5.5.32-Werror.patch @@ -0,0 +1,15 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Wed Jan 8 16:07:03 UTC 2014 +Subject: rm -Werror + +--- mysql-5.5.32/cmake/maintainer.cmake ++++ mysql-5.5.32/cmake/maintainer.cmake +@@ -18,7 +18,7 @@ + # Setup GCC (GNU C compiler) warning options. + MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS) + SET(MY_MAINTAINER_WARNINGS +- "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror") ++ "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing") + CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement" + HAVE_DECLARATION_AFTER_STATEMENT) + IF(HAVE_DECLARATION_AFTER_STATEMENT) diff --git a/dev-db/mysql/mysql-5.5.32.ebuild b/dev-db/mysql/mysql-5.5.32.ebuild index c8ba059ef83c..5ee92428681d 100644 --- a/dev-db/mysql/mysql-5.5.32.ebuild +++ b/dev-db/mysql/mysql-5.5.32.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.2 2014/03/19 00:52:45 hasufell Exp $ EAPI="4" @@ -11,7 +11,7 @@ MY_PV="${MY_PV//_/-}" # Build type BUILD="cmake" -inherit toolchain-funcs mysql-v2 +inherit eutils toolchain-funcs mysql-v2 # only to make repoman happy. it is really set in the eclass IUSE="$IUSE" @@ -31,6 +31,11 @@ RDEPEND="${RDEPEND}" # If you want to add a single patch, copy the ebuild to an overlay # and create your own mysql-extras tarball, looking at 000_index.txt +src_prepare() { + epatch "${FILESDIR}"/${PN}-5.5.32-Werror.patch + mysql-v2_src_prepare +} + # Official test instructions: # USE='berkdb -cluster embedded extraengine perl ssl community' \ # FEATURES='test userpriv -usersandbox' \ |