pinkbyte 14/04/28 07:20:08
Modified: boost-1.54.0-r1.ebuild ChangeLog
boost-1.53.0-r1.ebuild boost-1.55.0-r1.ebuild
boost-1.52.0-r6.ebuild
Log:
Add apropriate die message on unsupported overriden site-config.jam, wrt bug
#456792. Thanks to Raimar Sandner <gentoo-bugzilla AT 404not-found.de> for
reporting this issue
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
0x1F357D42)
Revision Changes Path
1.4 dev-libs/boost/boost-1.54.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild?r1=1.3&r2=1.4
Index: boost-1.54.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boost-1.54.0-r1.ebuild 7 Apr 2014 10:57:06 -0000 1.3
+++ boost-1.54.0-r1.ebuild 28 Apr 2014 07:20:08 -0000 1.4
@@ -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/dev-libs/boost/boost-1.54.0-r1.ebuild,v 1.3
2014/04/07 10:57:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild,v 1.4
2014/04/28 07:20:08 pinkbyte Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -61,6 +61,19 @@
__EOF__
}
+pkg_setup() {
+ # Bail out on unsupported build configuration, bug #456792
+ if [[ -f "${EROOT}etc/site-config.jam" ]]; then
+ grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
+ (
+ eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+ eerror "Boost can not be built in such configuration."
+ eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
+ die
+ )
+ fi
+}
+
src_prepare() {
epatch \
"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
1.317 dev-libs/boost/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.317&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.317&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.316&r2=1.317
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- ChangeLog 15 Apr 2014 15:56:31 -0000 1.316
+++ ChangeLog 28 Apr 2014 07:20:08 -0000 1.317
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.316 2014/04/15
15:56:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.317 2014/04/28
07:20:08 pinkbyte Exp $
+
+ 28 Apr 2014; Sergey Popov <pinkb...@gentoo.org> boost-1.52.0-r6.ebuild,
+ boost-1.53.0-r1.ebuild, boost-1.54.0-r1.ebuild, boost-1.55.0-r1.ebuild:
+ Add apropriate die message on unsupported overriden site-config.jam, wrt bug
+ #456792. Thanks to Raimar Sandner <gentoo-bugzilla AT 404not-found.de> for
+ reporting this issue
15 Apr 2014; Sergey Popov <pinkb...@gentoo.org>
-files/boost-1.48.0-respect_python-buildid.patch,
1.4 dev-libs/boost/boost-1.53.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild?r1=1.3&r2=1.4
Index: boost-1.53.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boost-1.53.0-r1.ebuild 7 Apr 2014 10:57:06 -0000 1.3
+++ boost-1.53.0-r1.ebuild 28 Apr 2014 07:20:08 -0000 1.4
@@ -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/dev-libs/boost/boost-1.53.0-r1.ebuild,v 1.3
2014/04/07 10:57:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild,v 1.4
2014/04/28 07:20:08 pinkbyte Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -61,6 +61,19 @@
__EOF__
}
+pkg_setup() {
+ # Bail out on unsupported build configuration, bug #456792
+ if [[ -f "${EROOT}etc/site-config.jam" ]]; then
+ grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
+ (
+ eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+ eerror "Boost can not be built in such configuration."
+ eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
+ die
+ )
+ fi
+}
+
src_prepare() {
epatch \
"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
1.5 dev-libs/boost/boost-1.55.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild?r1=1.4&r2=1.5
Index: boost-1.55.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- boost-1.55.0-r1.ebuild 7 Apr 2014 10:57:06 -0000 1.4
+++ boost-1.55.0-r1.ebuild 28 Apr 2014 07:20:08 -0000 1.5
@@ -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/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.4
2014/04/07 10:57:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.5
2014/04/28 07:20:08 pinkbyte Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -69,6 +69,19 @@
__EOF__
}
+pkg_setup() {
+ # Bail out on unsupported build configuration, bug #456792
+ if [[ -f "${EROOT}etc/site-config.jam" ]]; then
+ grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
+ (
+ eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+ eerror "Boost can not be built in such configuration."
+ eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
+ die
+ )
+ fi
+}
+
src_prepare() {
epatch \
"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
1.15 dev-libs/boost/boost-1.52.0-r6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild?rev=1.15&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild?rev=1.15&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild?r1=1.14&r2=1.15
Index: boost-1.52.0-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- boost-1.52.0-r6.ebuild 7 Apr 2014 10:17:50 -0000 1.14
+++ boost-1.52.0-r6.ebuild 28 Apr 2014 07:20:08 -0000 1.15
@@ -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/dev-libs/boost/boost-1.52.0-r6.ebuild,v
1.14 2014/04/07 10:17:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild,v
1.15 2014/04/28 07:20:08 pinkbyte Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -60,6 +60,19 @@
__EOF__
}
+pkg_setup() {
+ # Bail out on unsupported build configuration, bug #456792
+ if [[ -f "${EROOT}etc/site-config.jam" ]]; then
+ grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q
gentoodebug "${EROOT}etc/site-config.jam" ||
+ (
+ eerror "You are using custom
${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+ eerror "Boost can not be built in such configuration."
+ eerror "Please, either remove this file or add targets
from ${EROOT}usr/share/boost-build/site-config.jam to it."
+ die
+ )
+ fi
+}
+
src_prepare() {
epatch \
"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
