Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo/files: libjpeg-turbo-1.2.0-x32.patch |
| Date: | Sat, 09 Jun 2012 07:43:42 |
| Message-Id: | 20120609074327.CD25E2004C@flycatcher.gentoo.org |
| 1 | vapier 12/06/09 07:43:27 |
| 2 | |
| 3 | Added: libjpeg-turbo-1.2.0-x32.patch |
| 4 | Log: |
| 5 | Fix building for x32 targets #420239 by Xavier Miller. |
| 6 | |
| 7 | (Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: libjpeg-turbo-1.2.0-x32.patch |
| 16 | =================================================================== |
| 17 | https://bugs.gentoo.org/420239 |
| 18 | |
| 19 | https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160 |
| 20 | |
| 21 | --- configure |
| 22 | +++ configure |
| 23 | @@ -33,7 +33,11 @@ case "$host_os" in |
| 24 | linux*) |
| 25 | case "$host_cpu" in |
| 26 | x86_64) |
| 27 | - objfmt='ELF64' |
| 28 | + if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then |
| 29 | + objfmt='ELF64' |
| 30 | + else |
| 31 | + objfmt='ELFX32' |
| 32 | + fi |
| 33 | ;; |
| 34 | *) |
| 35 | objfmt='ELF' |
| 36 | @@ -94,6 +98,7 @@ case "$objfmt" in |
| 37 | a.out) NAFLAGS='-faout -DAOUT';; |
| 38 | BSD-a.out) NAFLAGS='-faoutb -DAOUT';; |
| 39 | ELF) NAFLAGS='-felf -DELF';; |
| 40 | + ELFX32) NAFLAGS='-felfx32 -DELF -D__x86_64__';; |
| 41 | ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; |
| 42 | RDF) NAFLAGS='-frdf -DRDF';; |
| 43 | Mach-O) NAFLAGS='-fmacho -DMACHO';; |
| 44 | --- simd/nasm_lt.sh |
| 45 | +++ simd/nasm_lt.sh |
| 46 | @@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do |
| 47 | pic=yes |
| 48 | fi |
| 49 | ;; |
| 50 | - -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \ |
| 51 | + -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \ |
| 52 | -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64) |
| 53 | # it's a file format specifier for nasm. |
| 54 | command="$command $1" |