From 4a2dabe9d53e6c361ecdeaba0431ef74a9ad297c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Jul 2010 21:38:35 +0200 Subject: neon: explicit path to xml2-config 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 --- package/neon/neon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/neon/neon.mk b/package/neon/neon.mk index ed5f99968..e942f8763 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) -- cgit v1.2.3 From 538773a66f2e71ac29cf799e3249737dd6903c8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Jul 2010 23:26:25 +0200 Subject: alsa-lib: make sure to only look in STAGING_DIR for Python includes 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 --- package/multimedia/alsa-lib/alsa-lib.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index 1f120c6f7..6e4c5754f 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 -- cgit v1.2.3