Fix LFS detection when cross-compiling #383963#1 by Tim Harder.

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

4 files changed, 57 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index b185b0c6269b..ed6383b1c5bd 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.442 2011/09/14 13:10:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.443 2011/09/22 02:09:05 vapier Exp $
+
+  22 Sep 2011; Mike Frysinger <vapier@gentoo.org> imagemagick-6.7.2.6.ebuild,
+  +files/imagemagick-6.7.2.6-lfs.patch:
+  Fix LFS detection when cross-compiling #383963#1 by Tim Harder.
 
 *imagemagick-6.7.2.6 (14 Sep 2011)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 071ec53b50a0..48737a99b864 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX imagemagick-6.7.2.6-lfs.patch 1364 RMD160 b1b2a27ce80790e0a82335828ba0db29b3ffa9a8 SHA1 106a1fea8a5207b552475ed2ba3394f51c2d3a77 SHA256 a2cb4cf3afa7a1259efdb947647a2ec2790c99d5eaf594713f099031441f366b
 DIST ImageMagick-6.6.5-6.tar.xz 6314756 RMD160 9c2d96bc1210356305096b27f2d829a8d3445356 SHA1 c129c813bd73deae5ec21491e8121f365bbdd7b3 SHA256 585a8372deb2052906c8fc74e84f96d72b711a08f804a4952cbb4c21fc4538fe
 DIST ImageMagick-6.6.7-6.tar.xz 7579776 RMD160 430a59204360abcc4180c33d99b53e0e352974f3 SHA1 054d1f22d173607cedb6acd7666b80d997ba2f44 SHA256 1b2ae5325847b37656a6486dbce9129b0ae37334d2f971835bbe0cf7c6542ba1
 DIST ImageMagick-6.6.8-5.tar.xz 7637460 RMD160 bc3b8c30ad8bf603106a19cdbd1c7f2908454dfd SHA1 ec80517e020c5800cdcf5bdf2b0c968009e7a439 SHA256 cbbf9f84daf837141b5a0d9bb4ffafb2263f6c23e661c405546deb7be603d919
@@ -10,13 +11,13 @@ EBUILD imagemagick-6.6.5.6.ebuild 4113 RMD160 62448e140a1ca859702df12b0760c71800
 EBUILD imagemagick-6.6.7.6.ebuild 4179 RMD160 36d0bc9ad0c7168e11619790ab7de09712fbbebe SHA1 d578764b45524fa4c532fd0d47d6c11a07778628 SHA256 2e541ebf5db2b23d244873dc7686429877e3d4e447ffe08c6699277b496a07b6
 EBUILD imagemagick-6.6.8.5.ebuild 4359 RMD160 8631ec958eee48796e3214b095d824be99894d30 SHA1 090b42c5cfae62163ea014c274947f4cb1fcfb56 SHA256 190a0bda6738466825d698036a5d9cb3828d79c82eafb76edebcc5872b0ad988
 EBUILD imagemagick-6.7.1.0.ebuild 4207 RMD160 04fb5424ce3f1101cc60f99251e36e20f55d4420 SHA1 2c88b0590912265ec4fadbb7028ab5e02c5dea64 SHA256 327011a358969b22239713946bb1e92aeb08549751b8531ed0d25944faa22ee0
-EBUILD imagemagick-6.7.2.6.ebuild 4213 RMD160 dc2a9fa21aca626ed3934f9cc269e536d5538a15 SHA1 faf61c3b087d154e4eac5c6f55df5b8f584c4518 SHA256 16aded793c4c86c70231325ad9130029b6e0e6e7d5b0ac9f0272fab18de692e6
-MISC ChangeLog 65358 RMD160 cd9d9fc5170db4ef8d8dd2ed46d72f93a3b30775 SHA1 2e81a62efc673f73cb5479b6759e4ec7ac8f5e5c SHA256 95f29df8ac4058067ecae689e2eb922cd03f4629bb889bf97426f96469863eea
+EBUILD imagemagick-6.7.2.6.ebuild 4296 RMD160 afdb8438b3a6769ee92b32090e24905295f1b43c SHA1 4a2dbc3623e93729a569a8828b1f839753e641b7 SHA256 d330287fa76cba5f02446d5df833b937366a6bccec946fcdab7075e6a778d017
+MISC ChangeLog 65540 RMD160 68f753e31d8e09a9bb098945910bb4807dfdfe98 SHA1 d785dd1946582dc2dde285b40d77511d1112fccb SHA256 2d0d98ce00a1d14904e04c7f2326c3af9894aaf7108e908a5489e4e130da5ad9
 MISC metadata.xml 996 RMD160 4afdb1acb67b84fdb8a4c4b720ec1858e85bc2fd SHA1 5cb81df1fbada2f137e13530b30af67baed6c68d SHA256 42f246f5285d9d6a16d764420e069baecd0518d126ecbbc3ff4fa81536947062
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5wp/kACgkQXkR9YqOcLPExyAD/cwGceOoJCtRFZYZ+shAQ2JfZ
-G0tphUGNseTkvtcxGHAA/1gPi58h96EwAx11pNSr5igLwNU5Xu9FOpMYVfohuvGf
-=jByH
+iF4EAREIAAYFAk56mMsACgkQaC/OocHi7JbY0AEAlhgExEzHRQ+Te5FOnTUGYPgZ
+utxjtfohttxtHUcAMNYA/jzkfZO/fqgG9trrX/tNl4LiseHmziDb5vaFliyIHpZq
+=L1CW
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch b/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch
new file mode 100644
index 000000000000..68877c0c5498
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch
@@ -0,0 +1,38 @@
+the AC_SYS_LARGEFILE macro sets up ac_cv_sys_file_offset_bits, and when
+it uses a value of "no", it means "does not need special lfs behavior".
+so let's not second guess the behavior of it by running our own little
+bit of code which breaks cross-compiling.  instead, only try the run
+test if we get back "unknown".
+
+sent upstream already.  they said they'd integrate it in the next release.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -434,9 +434,11 @@
+ AC_FUNC_FSEEKO
+ LFS_CPPFLAGS=''
+ if test "$enable_largefile" != no; then
+-    if test "$ac_cv_sys_file_offset_bits" != 'no'; then
+-        LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+-    else
++    case $ac_cv_sys_file_offset_bits in
++    no)
++        # nothing to do here as the host supports LFS fine
++        ;;
++    unknown)
+         AC_MSG_CHECKING([for native large file support])
+         AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
+           main () {
+@@ -445,7 +447,11 @@
+         [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+          AC_MSG_RESULT([yes])],
+         [AC_MSG_RESULT([no])])
+-    fi
++        ;;
++    *)
++        LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
++        ;;
++    esac
+     if test "$ac_cv_sys_large_files" != 'no'; then
+         LFS_CPPFLAGS="$LFS_CPPFLAGS -D_LARGE_FILES=1"
+     fi
diff --git a/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild b/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild
index 42b82dda6f2a..8be4683976b7 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild,v 1.1 2011/09/14 13:10:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild,v 1.2 2011/09/22 02:09:05 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator eutils autotools
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -63,6 +63,11 @@ RESTRICT="perl? ( userpriv )"
 
 DOCS=( AUTHORS.txt ChangeLog NEWS.txt README.txt )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lfs.patch
+	eautoreconf
+}
+
 src_configure() {
 	local depth=16
 	use q8 && depth=8