| 1 |
wolf31o2 08/02/05 03:16:30 |
| 2 |
|
| 3 |
Modified: ChangeLog libxml2-2.6.30-r1.ebuild |
| 4 |
Log: |
| 5 |
Added some code to skip the catalog generation on stage1/stage2, since we won't necessarily have xmlcatalog in the seed stage and libxml2 wouldn't get rebuilt until stage3, ending up with an empty catalog. This fixes bug #208887. |
| 6 |
(Portage version: 2.1.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.203 dev-libs/libxml2/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.203&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.203&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/ChangeLog?r1=1.202&r2=1.203 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v |
| 18 |
retrieving revision 1.202 |
| 19 |
retrieving revision 1.203 |
| 20 |
diff -u -r1.202 -r1.203 |
| 21 |
--- ChangeLog 11 Jan 2008 18:13:13 -0000 1.202 |
| 22 |
+++ ChangeLog 5 Feb 2008 03:16:30 -0000 1.203 |
| 23 |
@@ -1,6 +1,13 @@ |
| 24 |
# ChangeLog for dev-libs/libxml2 |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.202 2008/01/11 18:13:13 compnerd Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.203 2008/02/05 03:16:30 wolf31o2 Exp $ |
| 28 |
+ |
| 29 |
+ 05 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 30 |
+ libxml2-2.6.30-r1.ebuild: |
| 31 |
+ Added some code to skip the catalog generation on stage1/stage2, since we |
| 32 |
+ won't necessarily have xmlcatalog in the seed stage and libxml2 wouldn't get |
| 33 |
+ rebuilt until stage3, ending up with an empty catalog. This fixes bug |
| 34 |
+ #208887. |
| 35 |
|
| 36 |
11 Jan 2008; Saleem Abdulrasool <compnerd@g.o> |
| 37 |
libxml2-2.6.28.ebuild, libxml2-2.6.29.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 dev-libs/libxml2/libxml2-2.6.30-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: libxml2-2.6.30-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- libxml2-2.6.30-r1.ebuild 11 Jan 2008 17:09:57 -0000 1.1 |
| 54 |
+++ libxml2-2.6.30-r1.ebuild 5 Feb 2008 03:16:30 -0000 1.2 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2008 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild,v 1.1 2008/01/11 17:09:57 dang Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild,v 1.2 2008/02/05 03:16:30 wolf31o2 Exp $ |
| 60 |
|
| 61 |
inherit libtool flag-o-matic eutils |
| 62 |
|
| 63 |
@@ -10,7 +10,7 @@ |
| 64 |
LICENSE="MIT" |
| 65 |
SLOT="2" |
| 66 |
KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" |
| 67 |
-IUSE="debug doc ipv6 python readline test" |
| 68 |
+IUSE="bootstrap build debug doc ipv6 python readline test" |
| 69 |
|
| 70 |
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
| 71 |
XSTS_NAME_1="xmlschema2002-01-16" |
| 72 |
@@ -97,15 +97,23 @@ |
| 73 |
} |
| 74 |
|
| 75 |
pkg_postinst() { |
| 76 |
- # need an XML catalog, so no-one writes to a non-existent one |
| 77 |
- CATALOG="${ROOT}etc/xml/catalog" |
| 78 |
- |
| 79 |
- # we dont want to clobber an existing catalog though, |
| 80 |
- # only ensure that one is there |
| 81 |
- # <obz@g.o> |
| 82 |
- if [ ! -e ${CATALOG} ]; then |
| 83 |
- [ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml" |
| 84 |
- /usr/bin/xmlcatalog --create > ${CATALOG} |
| 85 |
- einfo "Created XML catalog in ${CATALOG}" |
| 86 |
+ # We don't want to do the xmlcatalog during stage1/stage2, as xmlcatalog |
| 87 |
+ # will not be in / and stage1 builds to ROOT=/tmp/stage1root while stage2 |
| 88 |
+ # doesn't pull in this package. This fixes bug #208887. |
| 89 |
+ if use build || use bootstrap |
| 90 |
+ then |
| 91 |
+ elog "Skipping XML catalog creation for stage building (bug #208887)." |
| 92 |
+ else |
| 93 |
+ # need an XML catalog, so no-one writes to a non-existent one |
| 94 |
+ CATALOG="${ROOT}etc/xml/catalog" |
| 95 |
+ |
| 96 |
+ # we dont want to clobber an existing catalog though, |
| 97 |
+ # only ensure that one is there |
| 98 |
+ # <obz@g.o> |
| 99 |
+ if [ ! -e ${CATALOG} ]; then |
| 100 |
+ [ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml" |
| 101 |
+ /usr/bin/xmlcatalog --create > ${CATALOG} |
| 102 |
+ einfo "Created XML catalog in ${CATALOG}" |
| 103 |
+ fi |
| 104 |
fi |
| 105 |
} |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
-- |
| 110 |
gentoo-commits@l.g.o mailing list |
Archives