summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-08-20 00:10:26 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-08-20 00:10:26 +0200
commit8bc2fbe6dc7dc1e27f0640799643b17fe771814b (patch)
treebe5e8bc8c043fb377ad5a730ce267d5c96833ac0 /package
parent843c592a7c89dd564e17158871fa792aec1a5e97 (diff)
parent350b6c6e4b039ae0256e52cd06c6f6d769a1c2b1 (diff)
downloadbuildroot-novena-8bc2fbe6dc7dc1e27f0640799643b17fe771814b.tar.gz
buildroot-novena-8bc2fbe6dc7dc1e27f0640799643b17fe771814b.zip
Merge branch 'alsa-utils-fix' into for-2009.08
Conflicts: CHANGES
Diffstat (limited to 'package')
-rw-r--r--package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm29
-rw-r--r--package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr3229
-rw-r--r--package/multimedia/alsa-utils/alsa-utils.mk2
3 files changed, 1 insertions, 59 deletions
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm b/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
deleted file mode 100644
index e2103f850..000000000
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
+++ /dev/null
@@ -1,29 +0,0 @@
-When configuring alsa-utils, it will use the hosts <ncurses.h>
-See: alsa-utils <VERSION> / alsamixer/.deps/alsamicer.Po
-This will, on OpenSuSE 11.0, and possibly other distributions
-result in that the preprocessor directive:
-#define acs_map _nc_acs_map
-which is present in the Buildroot build of ncurses,
-is not executed, and the
-extern <chartype> acs_map[];
-declaration in the host ncurses will
-result in an undefined symbol: acs_map.
-
-This patches give up trying to force alsa-utils to use the correct
-ncurses, and just defines a byte with the needed symbol.
-
-
-diff -urN alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c alsa-utils-1.0.18/alsamixer/alsamixer.c
---- alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c 2008-10-29 13:42:11.000000000 +0100
-+++ alsa-utils-1.0.18/alsamixer/alsamixer.c 2009-01-22 23:35:29.000000000 +0100
-@@ -115,6 +115,10 @@
- #include <sys/time.h>
-
- #include <locale.h>
-+/* Ugly hack to get rid of undefined "acs_map" */
-+/* This is caused by configure using host ncurses.h */
-+/* instead of buildroot's ncurses.h */
-+unsigned long acs_map[1];
-
- #ifndef CURSESINC
- #include <ncurses.h>
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32 b/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
deleted file mode 100644
index e2103f850..000000000
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
+++ /dev/null
@@ -1,29 +0,0 @@
-When configuring alsa-utils, it will use the hosts <ncurses.h>
-See: alsa-utils <VERSION> / alsamixer/.deps/alsamicer.Po
-This will, on OpenSuSE 11.0, and possibly other distributions
-result in that the preprocessor directive:
-#define acs_map _nc_acs_map
-which is present in the Buildroot build of ncurses,
-is not executed, and the
-extern <chartype> acs_map[];
-declaration in the host ncurses will
-result in an undefined symbol: acs_map.
-
-This patches give up trying to force alsa-utils to use the correct
-ncurses, and just defines a byte with the needed symbol.
-
-
-diff -urN alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c alsa-utils-1.0.18/alsamixer/alsamixer.c
---- alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c 2008-10-29 13:42:11.000000000 +0100
-+++ alsa-utils-1.0.18/alsamixer/alsamixer.c 2009-01-22 23:35:29.000000000 +0100
-@@ -115,6 +115,10 @@
- #include <sys/time.h>
-
- #include <locale.h>
-+/* Ugly hack to get rid of undefined "acs_map" */
-+/* This is caused by configure using host ncurses.h */
-+/* instead of buildroot's ncurses.h */
-+unsigned long acs_map[1];
-
- #ifndef CURSESINC
- #include <ncurses.h>
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 06c6f138b..9f0b5d12d 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -17,7 +17,6 @@ $(DL_DIR)/$(ALSA_UTILS_SOURCE):
$(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
$(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch
- toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch.$(ARCH)
$(CONFIG_UPDATE) $(ALSA_UTILS_DIR)
touch $@
@@ -27,6 +26,7 @@ $(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked
$(TARGET_CONFIGURE_ARGS) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
+ ac_cv_prog_ncurses5_config=$(STAGING_DIR)/bin/ncurses5-config \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \