Fix cross-compile support.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 27 insertions, 8 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 50aa11d364bb..b4e47276827c 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/flex
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.29 2005/07/09 23:36:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.30 2005/08/11 04:14:11 vapier Exp $
+
+  11 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/flex-2.5.31-include.patch, flex-2.5.31.ebuild:
+  Fix cross-compile support.
 
 *flex-2.5.31 (09 Jul 2005)
 
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a85b1657bdf7..7ada150e770b 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA1
 
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 59cf0f07912483de7c559a713910a54a flex-2.5.31.ebuild 1083
+MD5 0004a26668af74a6e05a7374a422f6ca flex-2.5.31.ebuild 1124
 MD5 3f4500ac9117f90f14a3a82e3a5dc488 flex-2.5.4a-r5.ebuild 1304
 MD5 4448164288e262093358c29b1f2ea4df flex-2.5.4a-r6.ebuild 1476
-MD5 3bb1e21ed864cc93f499455ef8f8a345 ChangeLog 2124
+MD5 2bc8d53a6eb64105079a62519c91d706 ChangeLog 2260
 MD5 de46348f431a1b72e51b8f2253ebcaf3 files/flex-2.5.4a-gcc31.patch 3189
 MD5 28010d818ed73f21c9d37fd955c9f25b files/flex-2.5.4a-skel.patch 350
 MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
+MD5 2e16e2031744c71cd9cd1019ff0a1af3 files/flex-2.5.31-include.patch 387
 MD5 497470663c67fc14a2eb95b51f7f9614 files/flex-2.5.4a-gcc3.patch 277
 MD5 483b62e5eb13bbcf72e8ec7aaa34f554 files/digest-flex-2.5.4a-r6 137
 MD5 71c579c7b57e64f789b7c64801144cdf files/digest-flex-2.5.31 131
 MD5 a50411d58e9407414db98087253bdacd files/digest-flex-2.5.4a-r5 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC2lWGgIKl8Uu19MoRAvkwAJ9h85kv9AS6LFBfjpUpgnTZQCx2XQCdH56b
-WmWEdHk5R8aOrMXEQRomgYw=
-=aQmU
+iD8DBQFC+tC6gIKl8Uu19MoRAlJJAJ9QHl+L+7P703RPxdQAEa+MkeW8EACfe9dX
+yXxdLBK8+i0qoqqRjSJspDY=
+=Gf/F
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/flex-2.5.31-include.patch b/sys-devel/flex/files/flex-2.5.31-include.patch
new file mode 100644
index 000000000000..8769d0db928f
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.5.31-include.patch
@@ -0,0 +1,13 @@
+Remove stupid -I path because it screws up cross-compiling bad.
+
+--- Makefile.in
++++ Makefile.in
+@@ -290,7 +290,7 @@
+ 
+ 
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
++AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
+ 
+ # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
+ #
diff --git a/sys-devel/flex/flex-2.5.31.ebuild b/sys-devel/flex/flex-2.5.31.ebuild
index 01d692e8f0b3..ea957ede9651 100644
--- a/sys-devel/flex/flex-2.5.31.ebuild
+++ b/sys-devel/flex/flex-2.5.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31.ebuild,v 1.13 2005/07/17 12:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31.ebuild,v 1.14 2005/08/11 04:14:11 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+	epatch "${FILESDIR}"/${P}-include.patch
 }
 
 src_compile() {