diff options
author | Mike Frysinger <vapier@gentoo.org> | 2014-11-15 04:16:16 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2014-11-15 04:16:16 +0000 |
commit | d65e10fe607ef95aaa2afc37164658621b0cc9bd (patch) | |
tree | 1f0b7d3eb8de19de7e3f0832515af7090e5ef2e9 /app-arch | |
parent | Stabilize for alpha/arm64/ia64/m68k/ppc/ppc64/s390/sh #518926. (diff) | |
download | historical-d65e10fe607ef95aaa2afc37164658621b0cc9bd.tar.gz historical-d65e10fe607ef95aaa2afc37164658621b0cc9bd.tar.bz2 historical-d65e10fe607ef95aaa2afc37164658621b0cc9bd.zip |
Fix parallel build #528218 by Alexander E. Patrakov.
Diffstat (limited to 'app-arch')
-rw-r--r-- | app-arch/unrar/ChangeLog | 7 | ||||
-rw-r--r-- | app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch | 17 | ||||
-rw-r--r-- | app-arch/unrar/unrar-5.1.6.ebuild | 3 | ||||
-rw-r--r-- | app-arch/unrar/unrar-5.2.1.ebuild | 3 | ||||
-rw-r--r-- | app-arch/unrar/unrar-5.2.2.ebuild | 3 |
5 files changed, 29 insertions, 4 deletions
diff --git a/app-arch/unrar/ChangeLog b/app-arch/unrar/ChangeLog index 85202bcd431e..fddb7a2f6186 100644 --- a/app-arch/unrar/ChangeLog +++ b/app-arch/unrar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/unrar # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.236 2014/11/15 04:15:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.237 2014/11/15 04:16:16 vapier Exp $ + + 15 Nov 2014; Mike Frysinger <vapier@gentoo.org> unrar-5.1.6.ebuild, + unrar-5.2.1.ebuild, unrar-5.2.2.ebuild, + +files/unrar-5.2.2-no-auto-clean.patch: + Fix parallel build #528218 by Alexander E. Patrakov. 15 Nov 2014; Mike Frysinger <vapier@gentoo.org> unrar-5.1.6.ebuild: Stabilize for alpha/arm64/ia64/m68k/ppc/ppc64/s390/sh #518926. diff --git a/app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch b/app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch new file mode 100644 index 000000000000..ff78363cd5c0 --- /dev/null +++ b/app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch @@ -0,0 +1,17 @@ +if clean runs in parallel with $(OBJECTS), it is possible to build some +objects first, then the clean target fires and deletes some, and then we +try to link and fail. + +https://bugs.gentoo.org/528218 + +--- a/makefile ++++ b/makefile +@@ -118,7 +118,7 @@ + clean: + @rm -f *.o *.bak *~ + +-unrar: clean $(OBJECTS) $(UNRAR_OBJ) ++unrar: $(OBJECTS) $(UNRAR_OBJ) + $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) + $(STRIP) unrar + diff --git a/app-arch/unrar/unrar-5.1.6.ebuild b/app-arch/unrar/unrar-5.1.6.ebuild index 307fb8d441dc..05e040419f74 100644 --- a/app-arch/unrar/unrar-5.1.6.ebuild +++ b/app-arch/unrar/unrar-5.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.1.6.ebuild,v 1.6 2014/11/15 04:15:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.1.6.ebuild,v 1.7 2014/11/15 04:16:16 vapier Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs @@ -22,6 +22,7 @@ S=${WORKDIR}/unrar src_prepare() { epatch "${FILESDIR}"/${PN}-5.0.2-build.patch + epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218 local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) if [[ ${CHOST} == *-darwin* ]] ; then sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) diff --git a/app-arch/unrar/unrar-5.2.1.ebuild b/app-arch/unrar/unrar-5.2.1.ebuild index 6b78b385dc3f..bb6b2bd32138 100644 --- a/app-arch/unrar/unrar-5.2.1.ebuild +++ b/app-arch/unrar/unrar-5.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.1.ebuild,v 1.1 2014/10/24 17:25:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.1.ebuild,v 1.2 2014/11/15 04:16:16 vapier Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs @@ -22,6 +22,7 @@ S=${WORKDIR}/unrar src_prepare() { epatch "${FILESDIR}"/${PN}-5.0.2-build.patch + epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218 local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) if [[ ${CHOST} == *-darwin* ]] ; then sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) diff --git a/app-arch/unrar/unrar-5.2.2.ebuild b/app-arch/unrar/unrar-5.2.2.ebuild index e9ef19920966..02cd44fe9e50 100644 --- a/app-arch/unrar/unrar-5.2.2.ebuild +++ b/app-arch/unrar/unrar-5.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v 1.1 2014/11/08 19:00:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v 1.2 2014/11/15 04:16:16 vapier Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs @@ -22,6 +22,7 @@ S=${WORKDIR}/unrar src_prepare() { epatch "${FILESDIR}"/${PN}-5.0.2-build.patch + epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218 local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) if [[ ${CHOST} == *-darwin* ]] ; then sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) |