Commit 8bc2fbe6 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Merge branch 'alsa-utils-fix' into for-2009.08 

Conflicts:
	CHANGES
parents 843c592a 350b6c6e

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
	#541: Removal of CVS directories in target filesystem broken

	#547: berkeleydb: Update config.{sub, guess}

	#549: enchant: Fix dependencies.

	#569: Fix alsa-utils build for x86 on x86-64



2009.08-rc1, Released August 2nd, 2009:

package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
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>

package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
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>

package/multimedia/alsa-utils/alsa-utils.mk

+1 −1
Original line number Diff line number Diff line
@@ -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) \