diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-01-31 08:31:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-31 08:31:02 +0000 |
| commit | 6d226eaed078f5d841cccbc238e79a107462af09 (patch) | |
| tree | 5f836d930f8146808d1a19461bb2c76f46f8241c /www-servers | |
| parent | fix pcre-config/pkg-config/apr/apr-util handling when cross-compiling by leve... (diff) | |
| download | historical-6d226eaed078f5d841cccbc238e79a107462af09.tar.gz historical-6d226eaed078f5d841cccbc238e79a107462af09.tar.bz2 historical-6d226eaed078f5d841cccbc238e79a107462af09.zip | |
Add workaround for gen_test_char behavior when cross-compiling #385783 by Bertrand Jacquin.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/apache/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/apache/Manifest | 30 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.4.7.ebuild | 16 |
3 files changed, 35 insertions, 17 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 811794cc3d6a..a4786c32071a 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/apache # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.254 2014/01/24 03:39:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.255 2014/01/31 08:30:59 vapier Exp $ + + 31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-2.4.7.ebuild: + Add workaround for gen_test_char behavior when cross-compiling #385783 by + Bertrand Jacquin. 24 Jan 2014; Mike Frysinger <vapier@gentoo.org> apache-2.2.24.ebuild, apache-2.2.25.ebuild, apache-2.2.26.ebuild, apache-2.4.6-r1.ebuild, diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 45173f46fb99..13a4d3d9024d 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -21,24 +21,24 @@ EBUILD apache-2.2.25.ebuild 3425 SHA256 9ef0593b828b3723f3052962ff3af46c7afe126d EBUILD apache-2.2.26.ebuild 3432 SHA256 1b57058fc11ed840c05aedf37d365baf192054caf875cc8bdb34e7d552cc3afc SHA512 d909ab433605a8b8ebf411f365f14974d12e30dec6a8a58c1e3ae2f6406e2823fb5762f6b58b59776f9f65e3063c8141e24b34335f8ed6edc649cfe5eb84ec77 WHIRLPOOL 8f9917d96d1b247a4d93da84d435bfbc3c608caa04ebbd24eb45e062563137573f614e5f6645318b9db9f3e7aa94da65c594c06a146c7a2d93c80c9e63eed0c0 EBUILD apache-2.4.6-r1.ebuild 7594 SHA256 341d3ef490148163f1fae9e9f0153838931a7fc03b4c1a5da1752d0d1941096d SHA512 2d4f691deb7047b14342642d25b75b668832befe1128b8139a1e8d8b4ff9b7aee9b1ea3ea01a8a90d88fe7654eb6959a92f4e9f6bde272f2d8a39904f1d757f7 WHIRLPOOL 16fa1dfb6cead4019f7e8e1b5072e929ad1fed629aca272c6bf78848b66427be4728406f055b38d7aff4375f808105393a586c521a1b95936c1e06aa82572a37 EBUILD apache-2.4.6-r2.ebuild 7594 SHA256 7edbcff09eb3f906b26339fe0dec9db9f4f68f338a7de8384bbfff3e7ab5edd3 SHA512 61ddb4236772368f06954f1ced4dd3232e63485fa49701546bb7a5ad921b1d389079a9da617c986006e0e2dfedc2efd27e99688bc4e5fe19f185c1bb050a0ae2 WHIRLPOOL 130b7b318292051e4576a6102e3ba504fd9666e1accd95a9a52d1b99a83353e7fdcdfd94fcd4ad499996da75656dbad1a5a4da9f87d737aaf29f964706ad508d -EBUILD apache-2.4.7.ebuild 7579 SHA256 9cdfe915620fb345113c11d3e673f2746b036e73bff6cddcf842b1083563b866 SHA512 4413837e2eb3c469e241048b98f40d55290ca1617e5152d07be35ebe49fbebcb6076158028afe94a7431b269ef8de22a745db7cc6c38a0afbff49277b637bbcb WHIRLPOOL e5b864ac6f5a98ef105b3368a7f1b0a21250ae199d08811afecb5221dd3e6a5787973685ed04819972419192b03b1302208b0c67231dbe53dfbd8a2c9be4d0c3 -MISC ChangeLog 22973 SHA256 199fa18c928323a909cf3c9d221b41c2f252e97e08156e4ee6453dcac6c927f3 SHA512 d8202eca025e1386c5ccc20e822e77e48f2dab6b85aae575cc33cfb02d1724ae5ba1ea5424589cfeacacd08588254a981e8e2deb5144426f6ef5c45b9c1c3dd7 WHIRLPOOL 493ed784c1e8e35531a7121fa166b4dd1809c4437cf7efc44e02ca91b9ce9f088e9979d66dd7c2e00b6cf09aad8810f78641be5dc036999efa91264385592516 +EBUILD apache-2.4.7.ebuild 7948 SHA256 10e75d4069554711ae4a11a2dd514084e70f4f628a68824f0576b46213cc498e SHA512 6110f6901a698b2def6e2bb88103669163e2344bc5d41854b6ec7cdd78a90e93b602d29867c8cc00a49c66af19603b5a548a2c341206c6b15c82fb691cd2de75 WHIRLPOOL 64a5c8e8da3aba88ad8c45d88ee1b6a466139482530a0ada40971af56229ad216b33daf2c85e411ba7a2737d64070c653dc7053778114972ca14b3878e76fd74 +MISC ChangeLog 23141 SHA256 246533ddb76f8fffb3881e5454eeb9dbc50ab4d9bf446619284cf00c2ac75828 SHA512 679014390be2da27dcd133b435a495de8ea721b4427d96fe26defd9474b2e803faf8829ca5876889ea97ea54b0677cb29d63f34fd7f2b33ca2569dc6e22c58a2 WHIRLPOOL d51b77f8de6ac5e35ae3decc85fb78dfd93848ca9de44130fe8c6b8e82c5dc2c4a0742df9877f736a51c667d54d0b83c450e4609e468914b755bb9aee243bb71 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8 MISC metadata.xml 2590 SHA256 165207b1cfcf0ce30ad2af5b0dd7e8cf06dbfc9ae4ed42e35bbc5d8e6ce0fdee SHA512 74bd116d0678c035c0e19f82a379c80b7f59b87db649e9c6835a3133569c52d6c0973f9445054bb1b5278d22c95f28f3d85dfda0878ae094172f7e84e15a0113 WHIRLPOOL 8c5ce73c072551040ac44c6ee632fd6144cf2673904401481a01311fe9edf72eb8e1a3d57cee9f94c1c8d9d71d1f80ce2a2f11fb9cb3274b7057489fe7b8578c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS4eCPAAoJEPGu1DbS6WIApxQP/3hNKqpoZIIWQbWX/paHTDd8 -sCj0LQHGh4qW4pz8L4BB5UNcoZ/TgrJk8Iodb9tEmvHX49y+OKHsm8/sxIjFqw2W -cIw+nn8H6b5Y16MDPeVcXEqKED+f760zTESp2UYXiGR9cmUbFZfRzn20pGYM/7C8 -jxuC4LL7g3d7lZgpdAaaaa00V0gJhbIOmMJJOA2nQbMACLLn/Oucc9XsoxOfnvsj -7NP48+0i1oWvqfkrRgkUSYCOvsRCSqoKlgb39uGl4aw5tSf5tZQak0Y6y8j3MyyE -Oq+rIhGeAPn2rcYj21xtNy+7OV1pkNviCFmdRuROTKZApRxRKn6WeCEt5RfGe3Sr -TU11AZ8PoXJ5+pTt3/n3rr6VVkZqk8O0GGvuPosSJjXzL2uWyi1KWUtomRHtxZzs -g99nGio2n8DyMKwXMlFlcZpCTENJgruiVJEOuK04yQFpJnSM95AmYjujhZfrXelr -hvkvRaNKXnXJRiOXt+UWUKBWCdtGD7Lx8tNaXM0yNtOYOuBAMdeAdqu76/2YzAUp -+cYDkcf9/BeZQLdXk1n+fdgN/SxvqHaTGRon4hIoQhMKJakCj7lCshptqIyMZ1xt -mHd0vN0hcyrZbvjhB4qTuiMLJp4ccpkRMGTPFuHm2WpNCBegFG/XeTkQG3Vdzw45 -zBTiFWkCmRFewPcYkzoB -=u4IF +iQIcBAEBCAAGBQJS619FAAoJEPGu1DbS6WIAQ/oP/2NKaeVDTfdz+hh9+x6mPYxX +NbxXKF2q6qxUwX87XZ1lE1yP2xuvC5mS2VmQ+TcxenxnL2dcOckOxJFqn6ElaMTm +5YyRUxTrj22wVaUxTLJZ5KDFSaoMNO/3haeQYmDec7Fh3o3Cs0UfO1Ho2X9dkzdc +4mlJYptlAf8tzL6Wv4MdagAuoiJNbxKQg56MLeKLoI8Ko6bf07tlDjWjHvaeRJ/T +gPHnBVz9Et9+yYtHVGh0uVK5x5pLpREO/UxWv/iTodBDc9+jYbj3AyYuoZ8K6cQ4 +hZKhBK1+zqD/mYr5T5V2pcf4O2pjypc7Uv2gzpn/J4w8NTFy553BjNNa3q8KVady +WRYKhyt1bVVI9rsIeBDd1FB/+4jVqbfLc+Qmsnbboo15wVFK6Lr3kivQUXaDSKZ/ +k/BTmK9K94F0SYfdxuDaGzcTvK1A+g+yTZ7RvGob85Bqp1PzjbdZDMwUxklf1P8s +Iowf/ocxzN2IlNCPC2tdrB1WaT6l6tl0y4Af0H0LmekkkIUaGT/730WpT+bgO35i +YRaJKTk+AidMYbtnV7rsCIq5a0yWqBujzdjrZU0poczyqwpgXXIqRFO3yH51WDwC +QOp0HfLKjr8zhMAUZJSr+b27WWcTLjLf1Qn6wz/Myj/2OVugQiPWmty+zaDfuea4 +4FsovV+2VuTW8e3wHgQe +=il5X -----END PGP SIGNATURE----- diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild index 8f4f09d33db6..4813c4c9fa4b 100644 --- a/www-servers/apache/apache-2.4.7.ebuild +++ b/www-servers/apache/apache-2.4.7.ebuild @@ -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/www-servers/apache/apache-2.4.7.ebuild,v 1.4 2014/01/24 03:39:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.5 2014/01/31 08:30:59 vapier Exp $ EAPI=5 @@ -157,6 +157,20 @@ src_configure() { apache-2_src_configure } +src_compile() { + if tc-is-cross-compiler; then + # This header is the same across targets, so use the build compiler. + pushd server >/dev/null + emake gen_test_char + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ + gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die + popd >/dev/null + fi + + default +} + src_install() { apache-2_src_install for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do |