[Buildroot] [pull request] Pull request for branch other-build-fixes

[Buildroot] [pull request] Pull request for branch other-build-fixes

[Thomas Petazzoni]

The following changes since commit 1eb59f598f52b65b3d3adfcf74729091e95015f0:
  Peter Korsgaard (1):
        CHANGES: #2191 is resolved

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot other-build-fixes

Thomas Petazzoni (2):
      neon: explicit path to xml2-config
      alsa-lib: make sure to only look in STAGING_DIR for Python includes

 package/multimedia/alsa-lib/alsa-lib.mk |    4 +++-
 package/neon/neon.mk                    |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] neon: explicit path to xml2-config

[Thomas Petazzoni]

Now that $(STAGING_DIR)/usr/bin is not in the PATH, we need to
explicit the path to such tools.

This might also fix bug 1393 since by expliciting the path to
xml2-config, we'll force neon ./configure to choose our xml2-config
and not the one of the host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/neon/neon.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index ed5f999..e942f87 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -14,6 +14,7 @@ NEON_DEPENDENCIES:=host-pkg-config
 ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y)
 NEON_CONF_OPT+=--with-libxml2=yes
 NEON_CONF_OPT+=--with-expat=no
+NEON_CONF_ENV+=ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
 NEON_DEPENDENCIES+=libxml2
 endif
 ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
-- 
1.7.0.4

[Buildroot] [PATCH 2/2] alsa-lib: make sure to only look in STAGING_DIR for Python includes

[Thomas Petazzoni]

Even though we pass a -I option to tell alsa-lib to look for Python
includes in the STAGING_DIR, alsa-lib build process still looks in
/usr/include for some stuff, causing bug #321.

This fix is the one suggested by Ulf Samuelsson in bug #321, and
allows to make alsa-lib with Python support to build properly on a 64
bits machine with python-dev installed on the host. Without this fix,
the build fails with exactly the same problem that Ulf reported.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/alsa-lib/alsa-lib.mk |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 1f120c6..6e4c575 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -54,7 +54,9 @@ ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
 endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
-ALSA_LIB_CONF_OPT += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
+ALSA_LIB_CONF_OPT += \
+	--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
+	--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 ALSA_LIB_DEPENDENCIES = libpython
 else
-- 
1.7.0.4

[Buildroot] [pull request] Pull request for branch other-build-fixes

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The following changes since commit 1eb59f598f52b65b3d3adfcf74729091e95015f0:
 Thomas>   Peter Korsgaard (1):
 Thomas>         CHANGES: #2191 is resolved

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot other-build-fixes

Pulled and pushed, thanks!

-- 
Bye, Peter Korsgaard