Fix building for x32 targets #420239 by Xavier Miller.

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

4 files changed, 61 insertions, 7 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 210e788c4ae2..05e824cefa73 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libjpeg-turbo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.45 2012/06/09 00:05:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.46 2012/06/09 07:43:27 vapier Exp $
+
+  09 Jun 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/libjpeg-turbo-1.2.0-x32.patch, libjpeg-turbo-1.2.0-r2.ebuild:
+  Fix building for x32 targets #420239 by Xavier Miller.
 
   09 Jun 2012; Zac Medico <zmedico@gentoo.org> libjpeg-turbo-1.2.0-r1.ebuild,
   libjpeg-turbo-1.2.0-r2.ebuild:
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 805e9bd2afad..109e132f42a7 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,16 +2,27 @@
 Hash: SHA1
 
 AUX libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch 889 RMD160 a59bdfd56f86c5b35627fede136ab1f1bddeb6e7 SHA1 3bce6b6c1b5df4167a5694cc7ad44896fee073d1 SHA256 66bef73d49350d1bb173f27226aeb215d5c4b3729a5a23088a7dbbac5a2f960c
+AUX libjpeg-turbo-1.2.0-x32.patch 1240 RMD160 36661dae335cf1809b99ad0a1b94722fba580cb9 SHA1 9253567cb26365eb6cc84605796e9bf6b0e02a9d SHA256 b12ab8fbef2cd8ceafd2e26e8fca375894275b7a60216fabf23f4f1342e73347
 DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
 DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
 EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2685 RMD160 e12b395b5b09531070c6e3bd1e898e5a78459975 SHA1 a08b692270dbc3c415af35ad70318f2a0e1a97d6 SHA256 01facfbf8e95e2d2c31e278c139183f445814ced72fae27445085e9f4c37b03f
-EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2789 RMD160 82cfb8525369ae34e9fcac79b8c5fb3c8651e702 SHA1 08e8a2259ed595d4a42b0939d048de8273b17e60 SHA256 360e5e56dff607b76e600b672045468d0bfdc4d8f9ffb018ba9b1232e960691e
-MISC ChangeLog 6922 RMD160 8658057316b80439933c68ca58769a930199f726 SHA1 df204f6e57676481eb8bfbfb014da80035b37180 SHA256 182f4003df4c3c0dac705932634a58e2ab143d848a7600533915af9d884b573a
+EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2833 RMD160 2318e26a51031442834deb9b5f33e6a90731adcb SHA1 0560e61b049f350b0ea98a88a33d4dfaf422c89f SHA256 1d790a510fe304742aa61c8265f2002c82f39546ef4a7c70cf56f2045dcfa0e9
+MISC ChangeLog 7100 RMD160 849b2eefcb6a872847d32e66097fc81d019145ea SHA1 f94ca085743c27cb92368e72b9fd0ef96fecd332 SHA256 02938b76398141e7073be9ace769dae9ee62055c82b0a544db0fac8d6f099a13
 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/Sk1cACgkQ/ejvha5XGaOBxwCg44s3e+4VAfonKgYoKyswsfsx
-wMoAoJQUEC1Hsf36pAIND0RoygBpQy4X
-=NYty
+iQIcBAEBAgAGBQJP0v6qAAoJELEHsLL7fEFW2NwP/jriaeet6GuqB4wTL2EpPNjx
+0xvxDqAoX84E7dTgfihupenofYfVtnRrz0r78zWQZJNIzkv1hHTmLrDkdRMU8tFT
+JwaGvKbnWPX/b0nvJQxddPgdsZkVoxjleiKJ9rL56s6l+ifSKbBpVWwxPTrA4q/J
+vTkARVBr7Gc/VqfJZJzK0IhJ0SI5Hyuunpf5zkTpNUFPAjM1c7AVqPwFUET9SZwX
+ozq0A+eTmHNIqdhOj64ojSFbR+zi7OblqIP7hfkzuFmHoE61A1+EAQBlsVuPJ0Yl
+Ba4W+B/YA0h7vmRWAlIyZyVBhlvZaeBGy6oNnDq+RpoBh9AQhd+4cfE1tE61kh3M
+ceDV4L6inaCgLYuu1kFmK+UuszNcWm691LBbJ01I4dGKqrvyUDd3d6zUgmTtHL+O
+qOBD6Jb4ILxcAv/19uq5Q47g8/+exVOtPteUqvl8C2TbMCL9NVndhz4q5R71EdPS
+W7iZeWHekQls4FOo+aT82MLwaWlmUs9/GA8gL2/ioK+3ZuKhcZz6lA7SHzgSY+FA
+FrPupQaNGTdmJGkcgSD5w0pojHcBX6ESdUq0k5xxX8wB9IClHs6u5REC8rbYx4i1
+yod2LludAPu10pumPbunbIiqvXQ5gEkfqtQEqpRK0LURZONxkMrP1eDI0UMWbyRV
+PXKslCv0mZCogcREv8lI
+=osGo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
new file mode 100644
index 000000000000..d85a4d7908f3
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/420239
+
+https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
+
+--- configure
++++ configure
+@@ -33,7 +33,11 @@ case "$host_os" in
+   linux*)
+     case "$host_cpu" in
+       x86_64)
+-        objfmt='ELF64'
++        if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then
++          objfmt='ELF64'
++        else
++          objfmt='ELFX32'
++        fi
+         ;;
+       *)
+         objfmt='ELF'
+@@ -94,6 +98,7 @@ case "$objfmt" in
+   a.out)      NAFLAGS='-faout -DAOUT';;
+   BSD-a.out)  NAFLAGS='-faoutb -DAOUT';;
+   ELF)        NAFLAGS='-felf -DELF';;
++  ELFX32)     NAFLAGS='-felfx32 -DELF -D__x86_64__';;
+   ELF64)      NAFLAGS='-felf64 -DELF -D__x86_64__';;
+   RDF)        NAFLAGS='-frdf -DRDF';;
+   Mach-O)     NAFLAGS='-fmacho -DMACHO';;
+--- simd/nasm_lt.sh
++++ simd/nasm_lt.sh
+@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
+                 pic=yes
+             fi
+             ;;
+-        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \
++        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \
+         -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64)
+             # it's a file format specifier for nasm.
+             command="$command $1"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
index e53dd9348064..f155fe01107e 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.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/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.3 2012/06/09 00:05:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.4 2012/06/09 07:43:27 vapier Exp $
 
 EAPI=4
 
@@ -41,6 +41,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-guard_against_bad_num_components_value.patch
+	epatch "${FILESDIR}"/${P}-x32.patch #420239
 
 	if [[ -x ./configure ]]; then
 		elibtoolize