diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-06-09 07:43:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-06-09 07:43:27 +0000 |
| commit | 08943da3e9371254a73a8bbd6aa105a731b9666c (patch) | |
| tree | 3d4daa48517015ea619d22c4b3abd0c5a4d59cf8 /media-libs | |
| parent | marked x86 per bug 420355 (diff) | |
| download | gentoo-2-08943da3e9371254a73a8bbd6aa105a731b9666c.tar.gz gentoo-2-08943da3e9371254a73a8bbd6aa105a731b9666c.tar.bz2 gentoo-2-08943da3e9371254a73a8bbd6aa105a731b9666c.zip | |
Fix building for x32 targets #420239 by Xavier Miller.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libjpeg-turbo/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch | 38 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild | 3 |
3 files changed, 45 insertions, 2 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/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 |