diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-13 23:51:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-13 23:51:26 +0000 |
| commit | 7ede02f15c01669f058b760b3cdcafc8fd430d83 (patch) | |
| tree | 6871151e0d508e5ee57ba9e4f5ffe02cd92bbd9d /sys-apps/file | |
| parent | Clean up the ebuild. Add support for cross-compiling. Try to fix parallel b... (diff) | |
| download | historical-7ede02f15c01669f058b760b3cdcafc8fd430d83.tar.gz historical-7ede02f15c01669f058b760b3cdcafc8fd430d83.tar.bz2 historical-7ede02f15c01669f058b760b3cdcafc8fd430d83.zip | |
Cross-compiling patch from uClibc.
Diffstat (limited to 'sys-apps/file')
| -rw-r--r-- | sys-apps/file/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/file/file-4.12.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/file/files/file-4.12-cross-compile.patch | 30 |
3 files changed, 41 insertions, 3 deletions
diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index 1e30137f4674..4f2ae39ec96d 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/file # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.76 2004/12/11 07:33:58 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.77 2004/12/13 23:51:26 vapier Exp $ + + 13 Dec 2004; Mike Frysinger <vapier@gentoo.org> + +files/file-4.12-cross-compile.patch, file-4.12.ebuild: + Cross-compiling patch from uClibc. 11 Dec 2004; Markus Rothe <corsair@gentoo.org> file-4.12.ebuild: Stable on ppc64; bug #72521 diff --git a/sys-apps/file/file-4.12.ebuild b/sys-apps/file/file-4.12.ebuild index 77a86e4e1cb8..ef037782ca90 100644 --- a/sys-apps/file/file-4.12.ebuild +++ b/sys-apps/file/file-4.12.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.10 2004/12/13 01:45:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.11 2004/12/13 23:51:26 vapier Exp $ -inherit flag-o-matic gnuconfig eutils distutils libtool +inherit flag-o-matic gnuconfig eutils distutils libtool toolchain-funcs DESCRIPTION="Program to identify a file's format by scanning binary data for patterns" HOMEPAGE="ftp://ftp.astron.com/pub/file/" @@ -27,6 +27,10 @@ src_unpack() { # recognize things. use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff + # The build process tries to run the compiled file ... not a good + # thing if file was cross compiled ;) + tc-is-cross-compiler && epatch ${FILESDIR}/${P}-cross-compile.patch + # GNU updates uclibctoolize gnuconfig_update diff --git a/sys-apps/file/files/file-4.12-cross-compile.patch b/sys-apps/file/files/file-4.12-cross-compile.patch new file mode 100644 index 000000000000..b2b7d3c80707 --- /dev/null +++ b/sys-apps/file/files/file-4.12-cross-compile.patch @@ -0,0 +1,30 @@ +--- file-4.10/magic/Makefile.in.orig 2004-07-24 14:38:55.000000000 -0600 ++++ file-4.10/magic/Makefile.in 2004-07-28 12:16:23.000000000 -0600 +@@ -490,10 +490,10 @@ + done >> $@ + + magic.mgc: magic +- $(top_builddir)/src/file -C -m magic ++ /usr/bin/file -C -m magic + + magic.mime.mgc: magic.mime +- $(top_builddir)/src/file -C -m $(srcdir)/magic.mime ++ /usr/bin/file -C -m $(srcdir)/magic.mime + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +--- file-4.10/magic/Makefile.am.orig 2004-07-24 14:38:55.000000000 -0600 ++++ file-4.10/magic/Makefile.am 2004-07-28 12:18:15.000000000 -0600 +@@ -16,10 +16,10 @@ + done >> $@ + + magic.mgc: magic +- $(top_builddir)/src/file -C -m magic ++ /usr/bin/file -C -m magic + + magic.mime.mgc: magic.mime +- $(top_builddir)/src/file -C -m $(srcdir)/magic.mime ++ /usr/bin/file -C -m $(srcdir)/magic.mime + + magic_FRAGMENTS = \ + Magdir/acorn \ |