commit: deeee63ae23debdc59584cb9e2e25ee2d87751b5 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Sep 23 13:05:01 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Sep 23 13:06:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deeee63a
sys-libs/libblockdev: Don't build with "-Werror" by default Closes: https://bugs.gentoo.org/744289 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-libs/libblockdev/libblockdev-2.24.ebuild | 11 ++++++++--- sys-libs/libblockdev/libblockdev-9999.ebuild | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild index 2d41db82758..04aa60d4808 100644 --- a/sys-libs/libblockdev/libblockdev-2.24.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.24.ebuild @@ -4,12 +4,12 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 xdg-utils +inherit autotools python-single-r1 xdg-utils DESCRIPTION="A library for manipulating block devices" HOMEPAGE="https://github.com/storaged-project/libblockdev"; if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"; BDEPEND=" sys-devel/autoconf-archive @@ -73,7 +73,12 @@ pkg_setup() { src_prepare() { xdg_environment_reset #623992 default - [[ "${PV}" == *9999 ]] && eautoreconf + + # https://bugs.gentoo.org/744289 + find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ + | xargs --null sed "s@ -Werror@@" -i || die + + eautoreconf } src_configure() { diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild index 214de07c57c..1ad37598e5f 100644 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ b/sys-libs/libblockdev/libblockdev-9999.ebuild @@ -4,12 +4,12 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 xdg-utils +inherit autotools python-single-r1 xdg-utils DESCRIPTION="A library for manipulating block devices" HOMEPAGE="https://github.com/storaged-project/libblockdev"; if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"; BDEPEND=" sys-devel/autoconf-archive @@ -73,7 +73,12 @@ pkg_setup() { src_prepare() { xdg_environment_reset #623992 default - [[ "${PV}" == *9999 ]] && eautoreconf + + # https://bugs.gentoo.org/744289 + find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ + | xargs --null sed "s@ -Werror@@" -i || die + + eautoreconf } src_configure() {
