diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-04-20 08:25:13 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-04-20 08:25:13 +0000 |
commit | b45c9c67ba8231879b823a1ba1e50014d755eca0 (patch) | |
tree | efae4a9e161d17158521b8a401fbfe450e95e564 /sys-fs | |
parent | bump one rm one (diff) | |
download | gentoo-2-b45c9c67ba8231879b823a1ba1e50014d755eca0.tar.gz gentoo-2-b45c9c67ba8231879b823a1ba1e50014d755eca0.tar.bz2 gentoo-2-b45c9c67ba8231879b823a1ba1e50014d755eca0.zip |
Fix compilation problems
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/aufs-util/ChangeLog | 6 | ||||
-rw-r--r-- | sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild | 5 | ||||
-rw-r--r-- | sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch | 16 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog index 2b865df49f9e..351084493aa2 100644 --- a/sys-fs/aufs-util/ChangeLog +++ b/sys-fs/aufs-util/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/aufs-util # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.46 2015/04/20 07:53:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/ChangeLog,v 1.47 2015/04/20 08:25:13 jlec Exp $ + + 20 Apr 2015; Justin Lecher <jlec@gentoo.org> + +files/aufs-util-4.0_p20150420-version.patch, aufs-util-4.0_p20150420.ebuild: + Fix compilation problems *aufs-util-4.0_p20150420 (20 Apr 2015) *aufs-util-3.19_p20150420 (20 Apr 2015) diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild index 32d0170720f8..b8c0a8c8e3ba 100644 --- a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild +++ b/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild,v 1.1 2015/04/20 07:53:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild,v 1.2 2015/04/20 08:25:13 jlec Exp $ EAPI=5 -inherit flag-o-matic linux-info multilib toolchain-funcs +inherit eutils flag-o-matic linux-info multilib toolchain-funcs DESCRIPTION="Utilities are always necessary for aufs" HOMEPAGE="http://aufs.sourceforge.net/" @@ -24,6 +24,7 @@ DEPEND="${RDEPEND} ~sys-fs/aufs-headers-${PV}" src_prepare() { + epatch "${FILESDIR}"/${P}-version.patch sed \ -e "/LDFLAGS += -static -s/d" \ -e "/CFLAGS/s:-O::g" \ diff --git a/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch b/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch new file mode 100644 index 000000000000..b861bb2bb0b7 --- /dev/null +++ b/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch @@ -0,0 +1,16 @@ + ver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ver.c b/ver.c +index 200b119..38abdd5 100644 +--- a/ver.c ++++ b/ver.c +@@ -25,7 +25,7 @@ + int main(int argc, char *argv[]) + { + regex_t preg; +- const char *pat = "^4\\.[0-9][0-9]"; ++ const char *pat = "^4\\.[0-9][0-9]?"; + + if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB)) + AuFin("regcomp"); |