NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alsa-utils: fix build for x86 on x86-64

Browse Source 
alsa-utils included two ugly patches for ARM and AVR32 to fix build
issues encountered with ncurses. In fact these build issues were
caused by the fact that alsa-utils was using ncurses5-config of the
host instead of the one installed in $(STAGING_DIR).

Therefore, these two patches are removed, and we instead pass
ac_cv_prog_ncurses5_config to the ./configure script.

This commit solves bug #569, reported by Simon Pasch, who also
contributed this fix.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-08-20 00:07:27 +02:00
parent a0c23b6d2b
commit 350b6c6e4b
4 changed files with 2 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -13,6 +13,7 @@
#525: sed broken with external toolchain
#537: Fix gzip build with recent glibc
#569: Fix alsa-utils build for x86 on x86-64
2009.08-rc1, Released August 2nd, 2009:

29
package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
View File

@ -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>

29
package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
View File

@ -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>

2
package/multimedia/alsa-utils/alsa-utils.mk
View File

@ -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) \