Make it build for mingw targets #393573 by jingtaozf.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

4 files changed, 50 insertions, 7 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 674d90691887..00ebab5ae035 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.103 2012/04/26 12:04:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.104 2012/05/17 04:36:15 vapier Exp $
+
+  17 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/bzip2-1.0.6-mingw.patch, bzip2-1.0.6-r3.ebuild:
+  Make it build for mingw targets #393573 by jingtaozf.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> bzip2-1.0.6-r3.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 66c7afe02939..8aad3b095e0e 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -6,19 +6,30 @@ AUX bzip2-1.0.3-no-test.patch 161 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f
 AUX bzip2-1.0.4-POSIX-shell.patch 672 RMD160 1863eb33a8fd89cb25d3a907e67e4e8c989bf88f SHA1 43ccd410482c2d51240afed34db59fee90344fa5 SHA256 34bc42c1d6c980e0970a517c9602b904efb2f676ec191e80fcbcd185ccb6b1fe
 AUX bzip2-1.0.4-makefile-CFLAGS.patch 569 RMD160 1fd187ef6c49bca32807a83842af3d76bbe1dddf SHA1 59f2d6172d0d8ced74f44258954e6760a6184987 SHA256 853621ae207f0115210e06f738d4e79861110712823419707875116cb45b105e
 AUX bzip2-1.0.4-man-links.patch 413 RMD160 ce3b8ae5b5c87024c959b95ace2868930a4ebcac SHA1 9f34a13a9c0e8c3f4808bf053f73a5e73158aaff SHA256 1fc9d91f3f7bd3eecd86149b9c95b3162d9d7956f7de543aa8bc41cbcd04f88b
+AUX bzip2-1.0.6-mingw.patch 556 RMD160 abf077f91975f7785e847bad57458332718e273c SHA1 f7ff32d808d4dfc0c9388ce4430918ac56d3093f SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717
 AUX bzip2-1.0.6-progress.patch 5756 RMD160 c288ba9362f429b279173b353abd4b4b40b68604 SHA1 353b74786f3f8fcddb73691780280a72ef77b85d SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7
 AUX bzip2-1.0.6-saneso.patch 439 RMD160 9738dcd8bd4c482ea3bec4409a9e5bce49ef82eb SHA1 605b3ad94084a4f6a905827e180336df95b20769 SHA256 8345a9fcfce28a459a12126748ac27480a384e80974c31d9fae752d818ea05d9
 DIST bzip2-1.0.6.tar.gz 782025 RMD160 cc31bbae95e8eec259cef7627eae0c667654a339 SHA1 3f89f861209ce81a6bab1fd1998c0ef311712002 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 EBUILD bzip2-1.0.6-r1.ebuild 2183 RMD160 a1e61ea3f7afa19c5b00d40e1b8712668aed46f2 SHA1 1d9a42eafef0a0b86bea516e1dcdd3ee8c053e1f SHA256 4d7615ffc4a8b3fa39d5626a7c2fa3d18ec9e34577a6983bf0c87039f1c2bbe3
 EBUILD bzip2-1.0.6-r2.ebuild 2155 RMD160 f8f0250e34d840aef9c6d28754bb67f3b9e699b6 SHA1 57f12f7d55cb435e79327d38ea0a5ad5243497e1 SHA256 664d950904d6a048cb299fc6eb93f18cb820c6fa009b32394d72b255c627eb15
-EBUILD bzip2-1.0.6-r3.ebuild 2374 RMD160 657b2b69fb3d05dddceb9ccdb4ff91bd66b79749 SHA1 da3133edae2023bf947dc8aaeb004d27353679dc SHA256 e6ebd0cf01790be09c40471e97207fa9ee4371e3e64c4083a60363e62979b147
+EBUILD bzip2-1.0.6-r3.ebuild 2426 RMD160 8b43b9fe34d10e4eec741dd6691bab20341cb0ae SHA1 192c0bdc1a6447e84e9253c56b9a443f26854b26 SHA256 780f1ab3808463a24d83316973eea0b70477104f5f304ba66a4ef2a899695363
 EBUILD bzip2-1.0.6.ebuild 2045 RMD160 ba8dd3bc5344fcf3a71d1f19af1808fc813d8e58 SHA1 f94effdd275b308cb20f2609addec001e00799a8 SHA256 c8d2600e7a05cfe24a1c252ea0a44f66ea6239dc9f87ee8d2c1fd06e32e69196
-MISC ChangeLog 15678 RMD160 7d37091fa5c554ab58b3dbff21f7140702a8fb37 SHA1 4845b0cb40bbdfc651199359bdfbdc5598700196 SHA256 29f9c92d0747b86cf77afbac635acb1d3e61499f785bdb6cc1a9009889242942
+MISC ChangeLog 15840 RMD160 116c11a3a602142d3cbc31e4ac3272e86593f71a SHA1 66b6cd556601422398b54dbd6e8830bfd2aab0a3 SHA256 2dcc99095b58b21cc0b06137633105a0846e82a12a33a833d1ef184d73dab96b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZOdsACgkQvFcC4BYPU0oQlACfaYLH6+ja59AzfkZJpLyey10o
-1PoAoJ/Gleq9vRyLMqzq2PeA/0PPICXt
-=ANDB
+iQIcBAEBAgAGBQJPtIBeAAoJELEHsLL7fEFWOTIQAKOFSIKkcCsqOt/J/vLmZcYX
+jq4bsGoKd7dEYUFXjjvNIMZ2jmU2zG2utyP/duBKLj70F0isnEKTbQ6eBZAQ8pYE
+3YSN4PpH3UdrZG9yd83/u2dTbbktivjrQxGP0BQAB+xuuI5/5BD5X3VWVqvXzOXL
+16R6z7wppoeUb5KWYRsHRPvYC2o/9hqo7mcCu1fgRkdCkrVudAKgrkrkQojQ+cAS
++mO4l0TSCtPinRSpLuFb8vJYVCK0Y9IUl2rotvAXrSYvt27N3wmyMXc75jMCPJyu
+Ocuca6OWUMlGMUxKM2gPudn9g9kVdIw6BRkfWIVYSKev79/ZcJZis0BMxdGOTH0t
+2mCtzELqkqcWgZfiSgu/EpEldKo217d0CLNLsKq2laOBgxmHrO4mMrncL7RdLjtK
+PgnZwHddjA4dWTCVleowbEWNyiGRnKMPXNtCN8ZzBiVNUlhcg9IJ63MWXMgy+Qcy
+I4ew3uPYwTUDcah+bi5GgLsph6A8IBqSS9HBBxojBE/wCo9k9uMoAFbyzweMeupA
+ZxLNS0bfTJy0D9WJZZ1uoUv8DyNS/6ibSZ+hW4UmGk1OcFK3+PqxOt4QbB4Ajb80
+b5hm8YAzAkCnajAoS/0P2M6tjg0Egg7+fR4gdNFS7ksH1jyDNs54peFCqPxQtioB
+epuWnkES5ikQybI2JUvE
+=q2Bp
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
index 06b2db4864c6..5a45b5b275a3 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r3.ebuild,v 1.10 2012/04/26 12:04:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r3.ebuild,v 1.11 2012/05/17 04:36:15 vapier Exp $
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
 #      (since we're building shared libs) ...
@@ -25,6 +25,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
 	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
 	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+	epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
 
 	# - Use right man path
 	# - Generate symlinks instead of hardlinks
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
new file mode 100644
index 000000000000..51469ca4c96e
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
@@ -0,0 +1,27 @@
+make it build for mingw targets
+
+https://bugs.gentoo.org/393573
+
+--- a/bzip2.c
++++ b/bzip2.c
+@@ -129,7 +129,7 @@
+ #if BZ_LCCWIN32
+ #   include <io.h>
+ #   include <fcntl.h>
+-#   include <sys\stat.h>
++#   include <sys/stat.h>
+ 
+ #   define NORETURN       /**/
+ #   define PATH_SEP       '\\'
+--- a/bzlib.h
++++ b/bzlib.h
+@@ -81,6 +81,9 @@ typedef
+       /* windows.h define small to char */
+ #      undef small
+ #   endif
++#   ifndef WINAPI
++#   define WINAPI
++#   endif
+ #   ifdef BZ_EXPORT
+ #   define BZ_API(func) WINAPI func
+ #   define BZ_EXTERN extern