From a9baa6bd9e2a5c6b138ed0d03cb41e5a27c7d636 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 5 Mar 2006 16:09:09 +0000 Subject: [PATCH] Disables inclusion of host includes ( /usrc/include/ ) as we don't provide OGG_CFLAGS. Fixes compilation error SVN-Revision: 3309 --- openwrt/package/speex/Makefile | 4 +++- .../speex/patches/01-disable-host-headers.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 openwrt/package/speex/patches/01-disable-host-headers.patch diff --git a/openwrt/package/speex/Makefile b/openwrt/package/speex/Makefile index 57e7ed47cf..e1d7f2d92b 100644 --- a/openwrt/package/speex/Makefile +++ b/openwrt/package/speex/Makefile @@ -21,9 +21,10 @@ $(eval $(call PKG_template,LIBSPEEX,libspeex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARC $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(strip $(TARGET_CFLAGS))" \ + CFLAGS="$(strip $(TARGET_CFLAGS)) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + OGG_CFLAGS="" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -55,6 +56,7 @@ $(PKG_BUILD_DIR)/.built: mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ + OGG_CFLAGS="" \ bin_PROGRAMS="" \ all install touch $@ diff --git a/openwrt/package/speex/patches/01-disable-host-headers.patch b/openwrt/package/speex/patches/01-disable-host-headers.patch new file mode 100644 index 0000000000..05c442b2c6 --- /dev/null +++ b/openwrt/package/speex/patches/01-disable-host-headers.patch @@ -0,0 +1,12 @@ +diff -urN speex-1.1.8/libspeex/Makefile.in speex-1.1.8.new/libspeex/Makefile.in +--- speex-1.1.8/libspeex/Makefile.in 2005-05-06 07:00:35.000000000 +0200 ++++ speex-1.1.8.new/libspeex/Makefile.in 2006-03-05 16:57:02.000000000 +0100 +@@ -107,7 +107,7 @@ + + EXTRA_DIST = testenc.c testenc_wb.c testenc_uwb.c testdenoise.c testecho.c + +-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 + -- 2.30.2