Do not use host includes, especially on 64-bits nomultilib systems

SVN-Revision: 11765

diff --git a/libs/speex/Makefile b/libs/speex/Makefile
index 6fbb10833827b10ca83902a3e4b723272f5b5a42..bd64f38e3cf1f7175ab7ec94b159355d52b8a7ae 100644 (file)
--- a/libs/speex/Makefile
+++ b/libs/speex/Makefile
@@ -48,7 +48,8 @@ define Build/Configure
                --enable-fixed-point \
                --disable-oggtest \
                --disable-float-api \
-               --disable-vbr \
+               --disable-vbr, \
+               OGG_CFLAGS="" \
        )
 endef
 

diff --git a/libs/speex/patches/001-remove_host_includes.patch b/libs/speex/patches/001-remove_host_includes.patch
new file mode 100644 (file)
index 0000000..0f6ec92
--- /dev/null
+++ b/libs/speex/patches/001-remove_host_includes.patch
@@ -0,0 +1,24 @@
+diff -urN speex-1.2beta3.2/libspeex/Makefile.am speex-1.2beta3.2.new/libspeex/Makefile.am
+--- speex-1.2beta3.2/libspeex/Makefile.am      2008-04-10 04:36:35.000000000 +0200
++++ speex-1.2beta3.2.new/libspeex/Makefile.am  2008-07-10 22:27:47.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ EXTRA_DIST=echo_diagnostic.m
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
++INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
+ 
+ lib_LTLIBRARIES = libspeex.la libspeexdsp.la
+ 
+diff -urN speex-1.2beta3.2/libspeex/Makefile.in speex-1.2beta3.2.new/libspeex/Makefile.in
+--- speex-1.2beta3.2/libspeex/Makefile.in      2008-04-10 18:07:52.000000000 +0200
++++ speex-1.2beta3.2.new/libspeex/Makefile.in  2008-07-10 22:31:58.000000000 +0200
+@@ -263,7 +263,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = echo_diagnostic.m
+-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
++INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
+ lib_LTLIBRARIES = libspeex.la libspeexdsp.la
+ 
+ # Sources for compilation in the library