[Buildroot] svn commit: trunk/buildroot/package/mpg123

[Bernhard Fischer]

On Sat, Jul 28, 2007 at 10:05:39AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-07-28 10:05:38 -0700 (Sat, 28 Jul 2007)
>New Revision: 19300
>
>Log:
>Bump version of mpg123,use configure, change site to Sourceforge
>
>Modified:
>   trunk/buildroot/package/mpg123/Config.in
>   trunk/buildroot/package/mpg123/mpg123.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/mpg123/Config.in
>===================================================================
>--- trunk/buildroot/package/mpg123/Config.in	2007-07-28 16:49:16 UTC (rev 19299)
>+++ trunk/buildroot/package/mpg123/Config.in	2007-07-28 17:05:38 UTC (rev 19300)
>@@ -6,3 +6,8 @@
> 	  MPEG 1.0/2.0 layers 1, 2 and 3.
> 
> 	  http://www.mpg123.de/
>+
>+config BR2_PACKAGE_MPG123_ALSA
>+	bool
>+	default y
>+	depends on BR2_PACKAGE_ALSA_LIB
>
>Modified: trunk/buildroot/package/mpg123/mpg123.mk
>===================================================================
>--- trunk/buildroot/package/mpg123/mpg123.mk	2007-07-28 16:49:16 UTC (rev 19299)
>+++ trunk/buildroot/package/mpg123/mpg123.mk	2007-07-28 17:05:38 UTC (rev 19300)
>@@ -3,53 +3,67 @@
> # mpg123
> #
> #############################################################
>+MPG123_VERSION=0.66
>+MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.bz2
>+MPG123_CAT:=$(BZCAT)
>+MPG123_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
>+MPG123_DIR:=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
>+MPG123_BIN:=mpg123
>+MPG123_TARGET_BIN:=usr/bin/$(MPG123_BIN)
> 
>-MPG123_VERSION=0.59r
>+# Check if ALSA is built, then we should configure after alsa-lib so
>+# ./configure can find alsa-lib.
>+ifeq ($(strip $(BR2_PACKAGE_MPG123_ALSA)),y)
>+MPG123_USE_ALSA:=--with-audio=alsa
>+MPG123_ALSA_DEP:=alsa-lib
>+endif
> 
>-# Don't alter below this line unless you (think) you know
>-# what you are doing! Danger, Danger!
>-
>-MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.gz
>-MPG123_CAT:=$(ZCAT)
>-MPG123_SITE=http://www.mpg123.de/mpg123
>-MPG123_DIR=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
>-
> $(DL_DIR)/$(MPG123_SOURCE):
> 	$(WGET) -P $(DL_DIR) $(MPG123_SITE)/$(MPG123_SOURCE)
> 
> $(MPG123_DIR)/.unpacked:	$(DL_DIR)/$(MPG123_SOURCE)
> 	$(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> 	toolchain/patch-kernel.sh $(MPG123_DIR) package/mpg123/ mpg123\*.patch
>+	$(CONFIG_UPDATE) $(MPG123_DIR)/build
> 	touch $@
> 
>-$(MPG123_DIR)/mpg123:	$(MPG123_DIR)/.unpacked
>-	rm -f $@
>-ifeq ($(BR2_ARCH),"i386")
>-	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux
>-else
>-ifeq ($(BR2_ENDIAN),"LITTLE")
>-	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-littleend
>-else
>-	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" -C $(MPG123_DIR) linux-bigend
>-endif
>-endif
>+$(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked
>+	(cd $(MPG123_DIR); rm -rf config.cache; \
>+		$(TARGET_CONFIGURE_OPTS) \
>+		CFLAGS="$(TARGET_CFLAGS)" \
>+		LDFLAGS="$(TARGET_LDFLAGS)" \

Missing TARGET_CONFIGURE_ARGS.

Ulf, you usually forget to use the TARGET_CONFIGURE_ARGS. Please audit
all of your patches to include them, TIA.

> mpg123-clean:
>-	-$(MAKE) -C $(MPG123_DIR) clean
>+	@if [ -d $(MPG123_DIR)/Makefile ] ; then \
>+		$(MAKE) -C $(MPG123_DIR) clean ; \
>+	fi;

This changes looks like it is wrong. Please revert (-$(MAKE) is the
correct thing to do).