summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-05-15 09:57:13 +0000
committerMike Frysinger <vapier@gentoo.org>2015-05-15 09:57:13 +0000
commit08403ab59f35125e93716628e363e2601c7f566f (patch)
tree7bb6e278864679d16510dd3175300e16f74b2763 /dev-libs/libxml2
parentversion bump, bug 531448, 549104, thanks Karl-Johan Karlsson and Ondrej Sury (diff)
downloadhistorical-08403ab59f35125e93716628e363e2601c7f566f.tar.gz
historical-08403ab59f35125e93716628e363e2601c7f566f.tar.bz2
historical-08403ab59f35125e93716628e363e2601c7f566f.zip
Fix from Chromium OS for cross-compiling.
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r--dev-libs/libxml2/ChangeLog6
-rw-r--r--dev-libs/libxml2/Manifest31
-rw-r--r--dev-libs/libxml2/files/libxml2-2.9.2-cross-compile.patch17
-rw-r--r--dev-libs/libxml2/libxml2-2.9.2-r1.ebuild4
4 files changed, 41 insertions, 17 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 3b6725fc63e8..47480429911b 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libxml2
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.452 2015/04/28 07:28:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.453 2015/05/15 09:57:11 vapier Exp $
+
+ 15 May 2015; Mike Frysinger <vapier@gentoo.org>
+ +files/libxml2-2.9.2-cross-compile.patch, libxml2-2.9.2-r1.ebuild:
+ Fix from Chromium OS for cross-compiling.
28 Apr 2015; Agostino Sarubbo <ago@gentoo.org> libxml2-2.9.2-r1.ebuild:
Stable for alpha, wrt bug #546720
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 609ac0eeea20..5a01810eaf8f 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
AUX libxml2-2.7.1-catalog_path.patch 2209 SHA256 b3343f0611f9cb6e55bf62047a988653e3e9cc50f194b18adbc330b455236290 SHA512 99c1953865c560d2b7a01cf5fd61b1c5150857f3df8a9753ca583f6ff0a99e01c02d2586bb12220a615cf9c40a540dbe0d17996c0547bc0d20cbeefd6b45682d WHIRLPOOL 9b4daf434b38a0ae8103f02625ae033e7a94012a18cabc981f34b93fe8b422477905b74cfee300eb6a37e1af8bd358dd84804a5d0b6be8645ae9ee3e4c6fcd9b
AUX libxml2-2.8.0_rc1-winnt.patch 2392 SHA256 c18b2c15550b3ff4709a85cd18d16368928319b1b7fd8875dc34acd67076b134 SHA512 e78d010c82f18386b4f0ff84497585755b43416563bccd11f8e4dbf0153ca8842934fe05dce6c2373d8360574a2165795a78ea991682aed9610000d2bfcb0164 WHIRLPOOL a87eefa17ad113ae4aed14744715b4e1781e0869a3bb789bdf4f243bdb3687d0d4b6ee2addc85bf5b2f86b9d1cc442d946f0329011f033e3a7855ae0ad79b745
AUX libxml2-2.9.2-constant-memory.patch 6332 SHA256 0c3be9bf93626ae9c6f5517d68515acf272beda14575ecc38b282502b0c032dc SHA512 ebc428f6c1a74162b4a1d5cba09631ab9d10eb71a64d2f13248b27bf19f4f5eb14655f431b788b507b2e743ce5855b2c54deab1be257366261671442d49c6074 WHIRLPOOL d98d91783eb5d8108963f86a8dfcbc372ceacccf3ee354a0abebcace5772f601801c7131085a1b031c9cf29d8dbded8a66ed6d10f9832932e4ad9fa95e98efe6
+AUX libxml2-2.9.2-cross-compile.patch 487 SHA256 495d0c9d461b57e05a92b57c7eec6136ee318badfffa0c6f81f44097611eca5b SHA512 aa856ea455233137f059c603d68ec8990602053d59606c8921849c0c40a78468ad4e75d09f333faf1c798e31c03cb55e8ddfcdf78b8ec9628f6bd8875a56e959 WHIRLPOOL bf24d7726d061fc27c568eb0ea979bda34b37e6fadd889ad57a5f98cb313461a9162702262c6a545cd3dc54b922be015e0bc542d2c4e1e94efedf929a246f216
AUX libxml2-2.9.2-icu-pkgconfig.patch 653 SHA256 b7e0e8ce27990d1ad8ef8eb3372a6cb9f8d7de5b0674613082ec3f6cdf214af1 SHA512 516fe55dc1500146e3fb1b8cf1c567aca668f54e65d7b595694cf668278217f0c2c82a03201dcdb463f8d5adda2620b42176a799bbaf2e1521500f8ed3971601 WHIRLPOOL f49a55065ab1a7d4159aa32b3182ae79c0b1d753f4aa81ef109eb38a2baa86c53a2ac98c391eebf0d1152206ec967adc1e4b41d6bbdabe3e6de791360d5c17af
AUX libxml2-2.9.2-missing-entities.patch 1139 SHA256 8cf04e6355d0ca8d1e96fb5e5e92819d395609f07aa5fe7e4876efc6023485d6 SHA512 4ab3ea64010f194acf5ba92268db42487234096896e0dfe00eafdaff00dcb0a3b692824e6acb4bfc072e44a41b65c7fafffad2eb3fad2e2c55874c166fc919aa WHIRLPOOL b397f2415bfed48f13d6547a42cdcd52054aaae1b168eae8bd3daf451392942347cb31d0a92b3f7cbc67cc8ad22dcf6423aba319d4eaed054d37f16d5d6bccbd
AUX libxml2-2.9.2-revert-missing-initialization.patch 715 SHA256 160258250f519b9d71e7d4ba913df6b2ba6109e1ac533bd19a3061ffbe82cd18 SHA512 cdad2b866684cc3193a5f3254339659e28ab4af988ba257ac0c41d42bf18c82665127cc705d36313f3bd4e5d6e1bb5bab0e966e9068398c62755ba54adea6b17 WHIRLPOOL 9addff866a02bee035b7aeccd4bd50baa74b0104c166cf02927fd779c92e41b119896a7fb2dcd0e255c7614018a80585b37f954ec36ae1a5871e0f885baff187
@@ -13,24 +14,24 @@ DIST libxml2-2.9.2.tar.gz 5444991 SHA256 5178c30b151d044aefb1b08bf54c3003a0ac55c
DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda
DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d
-EBUILD libxml2-2.9.2-r1.ebuild 6710 SHA256 6c9482848deeda6b22898fcdea618d25efd1c81328f7baa9a7b74d72222507d3 SHA512 288fd8f37eb562eaa72fb6a88277d4cc4489f0509cd52b03683da28b0339ac44da04b5ec73763888685fe408c06fd945e5df217eee4ae852a62977f9dfb9c1b3 WHIRLPOOL 57b119e820509321cdcefdf2d0933289664ae583700e8b608978d1493670f56a5fd99e67ea5a560c3a52931b8dd8cc6a5724cbd1bc66e2b99d5d7c2eaf27345a
+EBUILD libxml2-2.9.2-r1.ebuild 6769 SHA256 921e6f12c3d13f8ffeaba7b8a217c76a5124bc51fb9f64037b452c9a594215a7 SHA512 49063d8b989cbc589d92623af05860073a997ba675f302cd010ffc196e3032d95ab6b857576c2b950ddca41305fe17135cb9ccca149b354637b13920b0f5f00e WHIRLPOOL b726746abdc887c123a4a48b463f158f740afb0bfc39beef64bad70d7437ef835c10c41b42b3ee957ace6e22a82c8db3739bf5ff7c705917ea8815d3d72b28fc
EBUILD libxml2-2.9.2.ebuild 6500 SHA256 673b79f95dbe6ec1743240487585ca67ee0bb03ceb722b92e9313e8b3a3d0c25 SHA512 83da0196554d5b3af6be2d6c58ebc227f6aae8e03e7e7a0c6a1e6338dea0235c805ca07e497b58591a3f392761b743d4a88847f82fb50830c77e39dc4f756319 WHIRLPOOL 14452df05972fad2be967bec3fa2af7f5c8ee98545e51149189f86ea748d6aa7f32a4ad97435ec6fea5bdabc4b3a446d38b7f55510ff0f5c27e52fb957208d28
-MISC ChangeLog 64923 SHA256 1c08de282c932cef6ddce1a0f3d32e3d4bb3b66d4e555dc10d835959cf6ecd3e SHA512 7921bdd8f9d911b650b3b3bbfcbaa408d0d60a112c8ecb0008308e39c76c51764a3905a67aa82e93193c6dfd92a5290a2a1fd00621108817b2003b39c9c10a8c WHIRLPOOL e7b1ecad77b41b4feff6e5a1f1e397b05c04584ad5cbd1087b6dde76d1d7c346037549ccd193c4599d75c8c758206824ec17ea986a8bc3315c757abaa8d9ecb4
+MISC ChangeLog 65090 SHA256 d1ece3e020545bfdbf26dd7088b802ac23d5f6a626bd372e48300fd12de48acc SHA512 3917ff9efc731fbb7010e97b3438e8b0f49db998c1c5fc42712f88c39e97145b2b30b460a10930e2126fbd24c69af4464cecd85bf79383eb3e54e630fa6e1ea9 WHIRLPOOL 2bd41145633736da177987e9ae303613c172bf9323d7acc11eb22309f8bb656398e5501df532865b945631334172e3eb98f348ffbe5c60fc53309abdc287d1ae
MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVPza7AAoJELp701BxlEWf73MP/2Pvaj2IP3uqn+tWucp2b56R
-QJ5jKyBpLcs/qViNOTyghvrVVJMvLDUtlOnqeW1hdIZuS3KgmNdIOxa71ICyHtSK
-JegrjD+llfyAsNcfbWNViWvx2DKJQcQWvymQojwkKcZefO5z8/i6tY79Lc1xZhVC
-EnM7utVQftf6fjRaj9Wa6JsG9Bsfn2VSKZ4gvTukr6Lmt+7406jG7mqAdkOm5dMh
-xmsEIKn/7hPM1fhFCdtnyoVdyxT8q1TyJ7J6vayyCuZXFnLK3PCr4/QTl3WAgn2P
-jNT7T4GavBmmrIUNLd2bqQltaIlsYXpF7xNk1IdONWGemjDdWrKMcdx/Sx2qUNU/
-9SdB3wivGLvihiJp6fjTbMEKp4UZezOyN4bZEacLwtSE0Daw4Cm+Q/aln5fjmixn
-/qhB7rdvlu0Za5ETOM7nHl+JnXTuk24h2k//DZSrKf5ehPHjPSJctW5+JPNSRySW
-hoxsmO5VfYpnJjL63HumNIposFZ0+aqJtAjX89dpZlCHBnkAgq3kBPK3etoEVjlW
-ke5iW278nSEvnCJMNaa3mDGOA5l2oaUca8AnO9p8k4By3ImpGspUmP2W7aoKtdXb
-dMR4gTXs5MHUd5N92a2OeIXS05LhtR/naoF+iCD/5Hp3Sys+8rYy9V/emQ0jmPj0
-r5koAH3KZaJBaZOvyenU
-=iFP3
+iQIcBAEBCAAGBQJVVcL4AAoJEPGu1DbS6WIABTUP+gP155XJewdvlOwLvLDr2J/X
+559Sr+/xs7yYUsHS8B70RFXUdQN1l4h6fRTkNmP5bKzORnmRng5ipdKBh4Swl7og
+LJAN7ucFtZGXKCH4uwZIHAyPP4W0joWE73dv62HEkxLBml7+YcxQj0SQ+1GLoyfF
+gjCMxb6Ch1CslT8hvgbnyzcKb8JNhLsNTCES6DWyZEIs6FDqeT7vsatuLsUHxuAl
+U2YJ+X3sjDHs3hAcxcTwMOHwOLA4PIdJuIQlyk6wV0Ea3rhMRNK0JM5XSNT1NDa+
+MFsROgVUmZsznxqBI/f7qyybCz3+Vm9ZpOSXOdT/p2OjXWFFT3SevPwnXv+eUgsP
+Rm74RxTWeRiL0qi74xwUOGqhbVrvkgKP3wo7fAWGH//quZmJlCsabmg90cjOByw2
+dxY8wXbybV3RMY0s29mGRbqq2F7zUflLcj71iqkyARz6pmy+YAP7zsV6zcllEofU
+10JV8bfI0KiT+44iJ48wfQXYdmPCUpE/J0M8XikrVY7Y+u3u8jSiThgvCRdinHEA
+MkckFNONChnRBb+bnyzrN/uGo/mHSwADlBi2XzlaAaz0Z+/u/JH0WGjvGlgEHh9I
+x9ML1OYuTmFNXYiN1VptCjwpJ9LAb4g2ejTXBsrY0hZzQ4wfvCTIbtfnluwGS3JG
+19OwrSQHZT+kLpkqzqvU
+=YXBG
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-cross-compile.patch b/dev-libs/libxml2/files/libxml2-2.9.2-cross-compile.patch
new file mode 100644
index 000000000000..447222eeefb7
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-cross-compile.patch
@@ -0,0 +1,17 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=749416
+
+do not use -L$Z_DIR/lib when Z_DIR isn't actually set
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,7 +392,9 @@ if test "$with_zlib" = "no"; then
+ else
+ AC_CHECK_HEADERS(zlib.h,
+ [SAVE_LDFLAGS="${LDFLAGS}"
+- LDFLAGS="-L${Z_DIR}/lib"
++ if test "x${Z_DIR}" != "x"; then
++ LDFLAGS="${LDFLAGS} -L${Z_DIR}/lib"
++ fi
+ AC_CHECK_LIB(z, gzread,[
+ AC_DEFINE([HAVE_LIBZ], [1], [Have compression library])
+ WITH_ZLIB=1
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
index b487757d5119..c5a2b41ef20a 100644
--- a/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild,v 1.9 2015/04/28 07:28:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.2-r1.ebuild,v 1.10 2015/05/15 09:57:11 vapier Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -78,6 +78,8 @@ src_prepare() {
# epunt_cxx # if we don't eautoreconf
+ epatch "${FILESDIR}"/${PN}-2.9.2-cross-compile.patch
+
# Important patches from master
epatch \
"${FILESDIR}/${PN}-2.9.2-revert-missing-initialization.patch" \