diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 10:46:47 -0700 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 10:46:47 -0700 |
| commit | cbe8edf2569cb45077ccea894fe339a6680d12ac (patch) | |
| tree | b6fe078ae801843eabe3de4a4484e5a6820d3b0a /dev-libs | |
| parent | dev-libs/libxml2: clone upstream version (we need to revivie this for multili... (diff) | |
| download | gmt-cbe8edf2569cb45077ccea894fe339a6680d12ac.tar.gz gmt-cbe8edf2569cb45077ccea894fe339a6680d12ac.tar.bz2 gmt-cbe8edf2569cb45077ccea894fe339a6680d12ac.zip | |
dev-libs/libxml2-2.9.1-r3: multilib python header finding
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libxml2/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.1-mutilib-python-includes.patch | 12 | ||||
| -rw-r--r-- | dev-libs/libxml2/libxml2-2.9.1-r3.ebuild | 4 |
3 files changed, 18 insertions, 1 deletions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 838da92..19471b1 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -5,6 +5,7 @@ AUX libxml2-2.9.0-thread-alloc.patch 1819 SHA256 ab0e44f05903ea70babeff17aaac09f AUX libxml2-2.9.1-compression-detection.patch 3415 SHA256 02497f74371338b681e372b3fa6cdb3d24aa675caaa7a2e50fcf9bb117f29951 SHA512 28e1b914d60dea06d72de0523d289a4dca82ab3c505d796a223880fecebe22578369400a31f5d0f6ac02375e171ccb96368c0eb06ddaa67d9be377fc37c03357 WHIRLPOOL ca3eddb2ae8cdd088bb6b6a62c697a56d149a1134b892d2108d20baed4f4d951b8709604ac9d1b6cb8d6371a41b730c01e295de463242c6986401e25b518e622 AUX libxml2-2.9.1-icu-pkgconfig.patch 653 SHA256 e4a02666bd25e0771dcfa75edd4b22c4d2035c4c47f47f29f30b925a58bc38f7 SHA512 3d63f1f19b06a3edc92024e6b057a9d6c47274659ebebe59d20bc8e2fb62c902f19b1407aeb0903fa618aff4f43093997621dfc05dfef780df65db7d6bc2c44d WHIRLPOOL 28502cbd819bb6aedce3059ae6482cefab895053ff5dbf0d79aeb69663c77ffd38bee18a07a0e67d92424c32b6911089ba877c7a68b5badd91a321fe59dc59f5 AUX libxml2-2.9.1-missing-break.patch 670 SHA256 98681d90b279174160e8bd3901f468544a7956d163c86473a60756be05191bad SHA512 2efee76fffd0da39e197b9a51bcc3925323ae4e1e861f55daec9ae7872166b24ed207970ef8573d306c267215f1ddf5439b45f2cb6b6d308bf749b22accf5c97 WHIRLPOOL f51d55103ad2060c883091e23554e5d70724fa4b2a58767b6d15143f447f445aa09df1ad7ac022f84d53f5339478e4f9ab8624918ab61f44402e6f59b2a7785e +AUX libxml2-2.9.1-mutilib-python-includes.patch 423 SHA256 967d81284e2022af8269be16b3d5943a1913eb36237798a4d8b47314fb81fa54 SHA512 9dabf5ab87a68f7bcdc769b2071c639acecf7d875932d589d043b0245cef2d61ad1fc34461cd2f5340cf1b4660cbaca5ea2d0f26451c83e51bb705c6444c29da WHIRLPOOL 60598094b1eaf62c0fd0cd92189a25d9028a2fa0c64c49c242d2358870fe0bebfd345d9e78dc77c776a902b96c22f5cdf2f495529714ad98037dcda2dc4f8459 AUX libxml2-2.9.1-non-ascii-cr-lf.patch 5842 SHA256 1613e564814437ab1ddc28cb468cdebaff7e46587b364a4a6c7904c7b8da78b9 SHA512 1db9a31c1457e5ca6cb4397eb898a93e8985f1c73a5e213cbc1b70bc569fcef08c77af2f9123ed5b814903acda6cdf2e8b38434c81665f4456c8de4adb9345eb WHIRLPOOL adf9bb6dbff21494439589dc4f7b41d0719e0905811acc6719f637deffc0257f5aaf82534b8bf7761793a4ab7ecb12232a3de9d86c01391e6137043dbda22678 AUX libxml2-2.9.1-python-2.6.patch 912 SHA256 5a6e6def4dda78be1f44eb72c0e108f9c5deb4e74324d7845d024d643042c0b7 SHA512 9bf67f06301e1c59b232b00540305cf570b9dc32e8ac7b91d7bcfe188a668dfa6e5cfa13399267f9683ff484df317433536ad1a4d0c49a4ed068ea55d841cee2 WHIRLPOOL 99de5f267813e0f6ae13e408bc6e596bdd228cf7b72f3f38e2edeceff4ed6fc1ad1a2b1ee1e1d85bd4d3a7f9a27e215e8d1d7f264f3a2e25e3d8313dfd46d3d7 AUX libxml2-2.9.1-python3.patch 1328 SHA256 3702b2aec5e40b906358d13c11864fa0933b83f908f634171310e912bd6c2cd9 SHA512 29bbc4c4e58d8a5f24b6c58f61b3adef916becd2ba0a4c098faf5e889d0537d7f696237045b47a239b323babf637aa220f964d18cc047b8fb1bd3bf3b829d85c WHIRLPOOL ace0531053dbf8b0d8bafeb8ea03e1ff972608cc44dee8b238163264d43e8e8ffff8550066b30946b8f9a185f05f58b3a7e0892939802a0fc54e0a2c6963d0f0 @@ -13,6 +14,6 @@ DIST libxml2-2.9.1.tar.gz 5172503 SHA256 fd3c64cb66f2c4ea27e934d275904d92cec494a 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.1-r3.ebuild 6757 SHA256 3dbc85287c7daf0fa72ebbf2a4f26cecd9773ab6f7e9c3d6f88bd63caa86f6ed SHA512 71d8339937989e2692bc70400d2e686584e523c7b93a7c80fd1f86aa7af98805070aa455ee2de6b76e46cf5a2d746517084b226e4ebd6693dad12ec102abbb09 WHIRLPOOL 2d2405217772952f6dd111396ceeb178b940cf30ece31a09944d500e8f8a12e162692ad57992ee9728ca16c14ccceb88677352121c14f2c8a075667b3f2e6438 +EBUILD libxml2-2.9.1-r3.ebuild 6921 SHA256 6689380e889daf60ddcc0e75c596d0d2f10cafdb119950908702dfa4fd276bd1 SHA512 5300c865eebd410d7c51db3a997855a6b02210923f9b368bc4ceb67834a094ec4608bfb6ba4feaf93e6282dc8872c039fe2ba1b75c859a0c82ad9c14f268dd3c WHIRLPOOL 8a01e8e06b35efab221bb54ab1cc863d2c9745a950dce3f19199012193f187a4ff22ae8b5a410e2fc2c8b0bf543e34194a13ce1c51e13a0b0973d9eb0ce84f49 MISC ChangeLog 58626 SHA256 ac859e49cd4a179d0d3b40c0474d32a5ac5a71d119ec63f9069cce463cc353a9 SHA512 86131f44345e4825fa51e54bd52278a94bfbdaec90f2db31f11aad03575b0846cb357bf35de354873e57ce441d22071c08a7dc200d13f726aed117451170d515 WHIRLPOOL a25e385b26acad487412f1c2b2f98ac26827f1a4e2312e09aa98c30d01be942f9fae51a574f5356712b719447170a012cd7069537b1e1ae33c16a059a057717d MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3 diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-mutilib-python-includes.patch b/dev-libs/libxml2/files/libxml2-2.9.1-mutilib-python-includes.patch new file mode 100644 index 0000000..a845b65 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.1-mutilib-python-includes.patch @@ -0,0 +1,12 @@ +diff -urpN libxml2-2.9.1.orig/python/Makefile.am libxml2-2.9.1/python/Makefile.am +--- libxml2-2.9.1.orig/python/Makefile.am 2013-04-18 23:56:45.000000000 -0700 ++++ libxml2-2.9.1/python/Makefile.am 2014-04-24 10:44:36.979876598 -0700 +@@ -19,7 +19,7 @@ if WITH_PYTHON + AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(PYTHON_INCLUDES) ++ $(PYTHON_CFLAGS) + + python_LTLIBRARIES = libxml2mod.la + diff --git a/dev-libs/libxml2/libxml2-2.9.1-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r3.ebuild index 09fecfd..cff63f5 100644 --- a/dev-libs/libxml2/libxml2-2.9.1-r3.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.1-r3.ebuild @@ -69,6 +69,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch + # Patch required for multilib python header finding + epatch "${FILESDIR}"/${PN}-2.9.1-mutilib-python-includes.patch + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c # epunt_cxx # if we don't eautoreconf @@ -209,6 +212,7 @@ libxml2_py_emake() { PYTHON="${PYTHON}" \ PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \ PYTHON_LIBS="$(python-config --ldflags)" \ + PYTHON_CFLAGS="$(python-config --cflags)" \ PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ pythondir="$(python_get_sitedir)" "$@" popd > /dev/null |