|
Line
Link Here
|
| 0 |
-- libxml2-2.9.8.ebuild |
0 |
++ libxml2-2.9.8-r1.ebuild |
|
Lines 12-19
Link Here
|
| 12 |
|
12 |
|
| 13 |
LICENSE="MIT" |
13 |
LICENSE="MIT" |
| 14 |
SLOT="2" |
14 |
SLOT="2" |
| 15 |
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
15 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 16 |
IUSE="debug examples icu ipv6 lzma python readline static-libs test" |
16 |
IUSE="catalogless debug examples icu ipv6 lzma python readline static-libs test" |
| 17 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
17 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 18 |
|
18 |
|
| 19 |
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
19 |
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
|
Lines 44-52
Link Here
|
| 44 |
|
44 |
|
| 45 |
S="${WORKDIR}/${PN}-${PV%_rc*}" |
45 |
S="${WORKDIR}/${PN}-${PV%_rc*}" |
| 46 |
|
46 |
|
| 47 |
MULTILIB_CHOST_TOOLS=( |
47 |
pkg_setup() { |
| 48 |
/usr/bin/xml2-config |
48 |
MULTILIB_CHOST_TOOLS=( |
| 49 |
) |
49 |
/usr/bin/xml2-config |
|
|
50 |
$(usex catalogless /usr/bin/xml2-catalogless-config "") |
| 51 |
) |
| 52 |
} |
| 50 |
|
53 |
|
| 51 |
src_unpack() { |
54 |
src_unpack() { |
| 52 |
# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, |
55 |
# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, |
|
Lines 73-82
Link Here
|
| 73 |
|
76 |
|
| 74 |
eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
77 |
eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
| 75 |
|
78 |
|
| 76 |
# Fix build for Windows platform |
|
|
| 77 |
# https://bugzilla.gnome.org/show_bug.cgi?id=760456 |
| 78 |
# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch |
| 79 |
|
| 80 |
# Fix python detection, bug #567066 |
79 |
# Fix python detection, bug #567066 |
| 81 |
# https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
80 |
# https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
| 82 |
eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
81 |
eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
|
Lines 86-91
Link Here
|
| 86 |
sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
85 |
sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
| 87 |
fi |
86 |
fi |
| 88 |
|
87 |
|
|
|
88 |
if use catalogless; then |
| 89 |
cp -pr "${S}" "${S}-catalogless" || die |
| 90 |
fi |
| 91 |
|
| 89 |
# Please do not remove, as else we get references to PORTAGE_TMPDIR |
92 |
# Please do not remove, as else we get references to PORTAGE_TMPDIR |
| 90 |
# in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
93 |
# in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
| 91 |
# We now need to run eautoreconf at the end to prevent maintainer mode. |
94 |
# We now need to run eautoreconf at the end to prevent maintainer mode. |
|
Lines 93-98
Link Here
|
| 93 |
# epunt_cxx # if we don't eautoreconf |
96 |
# epunt_cxx # if we don't eautoreconf |
| 94 |
|
97 |
|
| 95 |
eautoreconf |
98 |
eautoreconf |
|
|
99 |
|
| 100 |
if use catalogless; then |
| 101 |
pushd "${S}-catalogless" > /dev/null || die |
| 102 |
eapply "${FILESDIR}"/${P}-catalogless.patch |
| 103 |
eapply "${FILESDIR}"/${P}-catalogless-generated.patch |
| 104 |
eautoreconf |
| 105 |
popd > /dev/null || die |
| 106 |
fi |
| 96 |
} |
107 |
} |
| 97 |
|
108 |
|
| 98 |
multilib_src_configure() { |
109 |
multilib_src_configure() { |
|
Lines 109-115
Link Here
|
| 109 |
# --with-mem-debug causes unusual segmentation faults (bug #105120). |
120 |
# --with-mem-debug causes unusual segmentation faults (bug #105120). |
| 110 |
|
121 |
|
| 111 |
libxml2_configure() { |
122 |
libxml2_configure() { |
| 112 |
ECONF_SOURCE="${S}" econf \ |
123 |
ECONF_SOURCE="${ECONF_SOURCE-${S}}" econf \ |
| 113 |
--with-html-subdir=${PF}/html \ |
124 |
--with-html-subdir=${PF}/html \ |
| 114 |
$(use_with debug run-debug) \ |
125 |
$(use_with debug run-debug) \ |
| 115 |
$(use_with icu) \ |
126 |
$(use_with icu) \ |
|
Lines 128-133
Link Here
|
| 128 |
|
139 |
|
| 129 |
libxml2_configure --without-python # build python bindings separately |
140 |
libxml2_configure --without-python # build python bindings separately |
| 130 |
|
141 |
|
|
|
142 |
if use catalogless; then |
| 143 |
mkdir -p "$(pwd)-catalogless" || die |
| 144 |
pushd "$(pwd)-catalogless" > /dev/null || die |
| 145 |
ECONF_SOURCE="${S}-catalogless" libxml2_configure --without-python |
| 146 |
popd > /dev/null || die |
| 147 |
fi |
| 148 |
|
| 131 |
if multilib_is_native_abi && use python; then |
149 |
if multilib_is_native_abi && use python; then |
| 132 |
python_foreach_impl libxml2_py_configure |
150 |
python_foreach_impl libxml2_py_configure |
| 133 |
fi |
151 |
fi |
|
Lines 135-140
Link Here
|
| 135 |
|
153 |
|
| 136 |
multilib_src_compile() { |
154 |
multilib_src_compile() { |
| 137 |
default |
155 |
default |
|
|
156 |
|
| 157 |
if use catalogless; then |
| 158 |
pushd "$(pwd)-catalogless" > /dev/null || die |
| 159 |
default |
| 160 |
popd > /dev/null || die |
| 161 |
fi |
| 162 |
|
| 138 |
if multilib_is_native_abi && use python; then |
163 |
if multilib_is_native_abi && use python; then |
| 139 |
local native_builddir=${BUILD_DIR} |
164 |
local native_builddir=${BUILD_DIR} |
| 140 |
python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all |
165 |
python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all |
|
Lines 143-148
Link Here
|
| 143 |
|
168 |
|
| 144 |
multilib_src_test() { |
169 |
multilib_src_test() { |
| 145 |
emake check |
170 |
emake check |
|
|
171 |
|
| 172 |
if use catalogless; then |
| 173 |
pushd "$(pwd)-catalogless" > /dev/null || die |
| 174 |
emake check |
| 175 |
popd > /dev/null || die |
| 176 |
fi |
| 177 |
|
| 146 |
multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test |
178 |
multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test |
| 147 |
} |
179 |
} |
| 148 |
|
180 |
|
|
Lines 150-155
Link Here
|
| 150 |
emake DESTDIR="${D}" \ |
182 |
emake DESTDIR="${D}" \ |
| 151 |
EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install |
183 |
EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install |
| 152 |
|
184 |
|
|
|
185 |
if use catalogless; then |
| 186 |
pushd "$(pwd)-catalogless" > /dev/null || die |
| 187 |
emake DESTDIR="${D}" \ |
| 188 |
EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install |
| 189 |
popd > /dev/null || die |
| 190 |
fi |
| 191 |
|
| 153 |
if multilib_is_native_abi && use python; then |
192 |
if multilib_is_native_abi && use python; then |
| 154 |
python_foreach_impl libxml2_py_emake \ |
193 |
python_foreach_impl libxml2_py_emake \ |
| 155 |
DESTDIR="${D}" \ |
194 |
DESTDIR="${D}" \ |
