diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-31 21:28:57 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-31 21:28:57 +0000 |
| commit | b019c39602f4cf318f8172923ed33904a62b7423 (patch) | |
| tree | 2eef6e7b05654e85347d1c3acac98ab902d6f094 /media-libs | |
| parent | Update HOMEPAGE wrt bug #479238. (diff) | |
| download | gentoo-2-b019c39602f4cf318f8172923ed33904a62b7423.tar.gz gentoo-2-b019c39602f4cf318f8172923ed33904a62b7423.tar.bz2 gentoo-2-b019c39602f4cf318f8172923ed33904a62b7423.zip | |
Wrap jconfig.h as it can differ between ABIs, bug #479302 by Alphat-PC.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libjpeg-turbo/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog index c18b0999c31c..8af6e9623b1a 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.64 2013/07/31 21:24:23 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.65 2013/07/31 21:28:57 aballier Exp $ + + 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> + libjpeg-turbo-1.3.0-r1.ebuild: + Wrap jconfig.h as it can differ between ABIs, bug #479302 by Alphat-PC. 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> libjpeg-turbo-1.3.0-r1.ebuild: diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild index ba9c16a5fb27..0ffd86da9f96 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.3.0-r1.ebuild,v 1.4 2013/07/31 21:24:23 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.5 2013/07/31 21:28:57 aballier Exp $ EAPI=5 @@ -41,6 +41,8 @@ DEPEND="${COMMON_DEPEND} x64-macos? ( ${ASM_DEPEND} ) java? ( >=virtual/jdk-1.5 )" +MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) + src_prepare() { epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 @@ -108,7 +110,6 @@ multilib_src_install() { rm -rf "${ED}"usr/classes java-pkg_dojar java/turbojpeg.jar fi - } multilib_src_install_all() { |