Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-10-31  6:40 ulf at uclibc.org
  2007-10-31  6:50 ` Hans-Christian Egtvedt
  0 siblings, 1 reply; 13+ messages in thread
From: ulf at uclibc.org @ 2007-10-31  6:40 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-10-30 23:40:36 -0700 (Tue, 30 Oct 2007)
New Revision: 20347

Log:
update ltmain.sh in libmad by running libtoolize during build

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-10-31 06:38:59 UTC (rev 20346)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-10-31 06:40:36 UTC (rev 20347)
@@ -36,8 +36,13 @@
 	)
 	touch $@
 
+# This rule runs 'libtoolize' since the ltmain.sh which comes in the tarball
+# is unsuitable with new libtool versions (causing shared libraries to build
+# without the .so extension).
+
 $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
+	(cd $(LIBMAD_DIR); libtoolize --force)
 	$(MAKE) -C $(LIBMAD_DIR)
 
 $(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-11-27 21:44 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-11-27 21:44 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-11-27 13:44:55 -0800 (Tue, 27 Nov 2007)
New Revision: 20554

Log:
libmad $(MAKE) should be run with full configure environment

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-11-27 21:40:57 UTC (rev 20553)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-11-27 21:44:55 UTC (rev 20554)
@@ -40,7 +40,7 @@
 
 $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
-	$(MAKE) -C $(LIBMAD_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBMAD_DIR)
 
 $(STAGING_DIR)/usr/lib/libmad.so.0: $(LIBMAD_DIR)/libmad.la
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-11-27 21:40 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-11-27 21:40 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-11-27 13:40:57 -0800 (Tue, 27 Nov 2007)
New Revision: 20553

Log:
Fix libmad configure order according to issue 0001571, revert old fix

Modified:
   trunk/buildroot/package/libmad/libmad-0.15.1b-optimization.patch.avr32
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad-0.15.1b-optimization.patch.avr32
===================================================================
--- trunk/buildroot/package/libmad/libmad-0.15.1b-optimization.patch.avr32	2007-11-27 21:15:15 UTC (rev 20552)
+++ trunk/buildroot/package/libmad/libmad-0.15.1b-optimization.patch.avr32	2007-11-27 21:40:57 UTC (rev 20553)
@@ -139,20 +139,19 @@
  unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
  
  # endif
-diff --git a/configure b/configure
-index ee421cc..7a9f0c8 100755
---- a/configure
-+++ b/configure
-@@ -1048,7 +1048,7 @@ Optional Features:
-   --enable-speed          optimize for speed over accuracy
-   --enable-accuracy       optimize for accuracy over speed
-   --enable-fpm=ARCH       use ARCH-specific fixed-point math routines (one of:
--                          intel, arm, mips, sparc, ppc, 64bit, default)
-+                          intel, arm, avr32, mips, sparc, ppc, 64bit, default)
-   --enable-sso            use subband synthesis optimization
-   --disable-aso           disable architecture-specific optimizations
-   --enable-strict-iso     use strict ISO/IEC interpretations
-@@ -21477,6 +21477,7 @@ if test "${enable_fpm+set}" = set; then
+diff --git a/configure.ac b/configure.ac
+index 9b79399..063cb9b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -274,13 +274,14 @@ fi
+ AC_MSG_CHECKING(for architecture-specific fixed-point math routines)
+ AC_ARG_ENABLE(fpm, AC_HELP_STRING([--enable-fpm=ARCH],
+ 		   [use ARCH-specific fixed-point math routines
+-		    (one of: intel, arm, mips, sparc, ppc, 64bit, default)]),
++		    (one of: intel, arm, avr32, mips, sparc, ppc, 64bit, default)]),
+ [
+     case "$enableval" in
+ 	yes)                             ;;
  	no|default|approx) FPM="DEFAULT" ;;
  	intel|i?86)        FPM="INTEL"   ;;
  	arm)               FPM="ARM"     ;;
@@ -160,7 +159,7 @@
  	mips)              FPM="MIPS"    ;;
  	sparc)             FPM="SPARC"   ;;
  	ppc|powerpc)       FPM="PPC"     ;;
-@@ -21498,6 +21499,7 @@ then
+@@ -298,6 +299,7 @@ then
      case "$host" in
  	i?86-*)     FPM="INTEL"  ;;
  	arm*-*)     FPM="ARM"    ;;
@@ -168,7 +167,7 @@
  	mips*-*)    FPM="MIPS"   ;;
  	sparc*-*)   FPM="SPARC"  ;;
  	powerpc*-*) FPM="PPC"    ;;
-@@ -21554,6 +21556,11 @@ then
+@@ -343,6 +345,11 @@ then
  	    ASO="$ASO -DASO_IMDCT"
  	    ASO_OBJS="imdct_l_arm.lo"
  	    ;;
@@ -180,19 +179,20 @@
  	mips*-*)
  	    ASO="$ASO -DASO_INTERLEAVE2"
  	    ASO="$ASO -DASO_ZEROCHECK"
-diff --git a/configure.ac b/configure.ac
-index 9b79399..063cb9b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -274,13 +274,14 @@ fi
- AC_MSG_CHECKING(for architecture-specific fixed-point math routines)
- AC_ARG_ENABLE(fpm, AC_HELP_STRING([--enable-fpm=ARCH],
- 		   [use ARCH-specific fixed-point math routines
--		    (one of: intel, arm, mips, sparc, ppc, 64bit, default)]),
-+		    (one of: intel, arm, avr32, mips, sparc, ppc, 64bit, default)]),
- [
-     case "$enableval" in
- 	yes)                             ;;
+diff --git a/configure b/configure
+index ee421cc..7a9f0c8 100755
+--- a/configure
++++ b/configure
+@@ -1048,7 +1048,7 @@ Optional Features:
+   --enable-speed          optimize for speed over accuracy
+   --enable-accuracy       optimize for accuracy over speed
+   --enable-fpm=ARCH       use ARCH-specific fixed-point math routines (one of:
+-                          intel, arm, mips, sparc, ppc, 64bit, default)
++                          intel, arm, avr32, mips, sparc, ppc, 64bit, default)
+   --enable-sso            use subband synthesis optimization
+   --disable-aso           disable architecture-specific optimizations
+   --enable-strict-iso     use strict ISO/IEC interpretations
+@@ -21477,6 +21477,7 @@ if test "${enable_fpm+set}" = set; then
  	no|default|approx) FPM="DEFAULT" ;;
  	intel|i?86)        FPM="INTEL"   ;;
  	arm)               FPM="ARM"     ;;
@@ -200,7 +200,7 @@
  	mips)              FPM="MIPS"    ;;
  	sparc)             FPM="SPARC"   ;;
  	ppc|powerpc)       FPM="PPC"     ;;
-@@ -298,6 +299,7 @@ then
+@@ -21498,6 +21499,7 @@ then
      case "$host" in
  	i?86-*)     FPM="INTEL"  ;;
  	arm*-*)     FPM="ARM"    ;;
@@ -208,7 +208,7 @@
  	mips*-*)    FPM="MIPS"   ;;
  	sparc*-*)   FPM="SPARC"  ;;
  	powerpc*-*) FPM="PPC"    ;;
-@@ -343,6 +345,11 @@ then
+@@ -21554,6 +21556,11 @@ then
  	    ASO="$ASO -DASO_IMDCT"
  	    ASO_OBJS="imdct_l_arm.lo"
  	    ;;

Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-11-27 21:15:15 UTC (rev 20552)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-11-27 21:40:57 UTC (rev 20553)
@@ -38,13 +38,8 @@
 	)
 	touch $@
 
-# This rule runs 'libtoolize' since the ltmain.sh which comes in the tarball
-# is unsuitable with new libtool versions (causing shared libraries to build
-# without the .so extension).
-
 $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
-	(cd $(LIBMAD_DIR); libtoolize --force)
 	$(MAKE) -C $(LIBMAD_DIR)
 
 $(STAGING_DIR)/usr/lib/libmad.so.0: $(LIBMAD_DIR)/libmad.la

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-11-02 22:37 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-11-02 22:37 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-11-02 15:37:58 -0700 (Fri, 02 Nov 2007)
New Revision: 20353

Log:
Avoid autoconf, to allow libmad build to complete

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-11-02 20:11:12 UTC (rev 20352)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-11-02 22:37:58 UTC (rev 20353)
@@ -18,6 +18,8 @@
 	$(CONFIG_UPDATE) $(LIBMAD_DIR)
 	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/libmad/ libmad-$(LIBMAD_VERSION)\*.patch
 	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/libmad/ libmad-$(LIBMAD_VERSION)\*.patch.$(ARCH)
+	# Prevent automake from running.
+	(cd $(LIBMAD_DIR); touch -c config* aclocal.m4 Makefile*);
 	touch $@
 
 $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
@@ -45,19 +47,22 @@
 	(cd $(LIBMAD_DIR); libtoolize --force)
 	$(MAKE) -C $(LIBMAD_DIR)
 
-$(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la
+$(STAGING_DIR)/usr/lib/libmad.so.0: $(LIBMAD_DIR)/libmad.la
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libmad.la
 
-$(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so
-	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad*
+$(TARGET_DIR)/usr/lib/libmad.so.0: $(STAGING_DIR)/usr/lib/libmad.so.0
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so.* $(TARGET_DIR)/usr/lib/
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad.so.*
 
-$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so
+$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so.0
 	mkdir -p $(TARGET_DIR)/usr/include
 	cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(STAGING_DIR)/usr/lib/libmad.*a $(TARGET_DIR)/usr/lib/
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.la $(TARGET_DIR)/usr/lib/
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so $(TARGET_DIR)/usr/lib/
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.a $(TARGET_DIR)/usr/lib/
 
-libmad: uclibc $(TARGET_DIR)/usr/lib/libmad.so
+libmad: uclibc $(TARGET_DIR)/usr/lib/libmad.so.0
 
 libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a
 

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-08-28 19:35 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 19:35 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-28 12:35:54 -0700 (Tue, 28 Aug 2007)
New Revision: 19718

Log:
Remove renamed libmad patch

Removed:
   trunk/buildroot/package/libmad/libmad-0.15.1b-avr32-optimization.patch


Changeset:

Sorry, the patch is too large to include (2927 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19718

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-08-28 19:33 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 19:33 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-28 12:33:27 -0700 (Tue, 28 Aug 2007)
New Revision: 19716

Log:
Allow for architecture specific libmad patches, make current patch AVR32 specific

Added:
   trunk/buildroot/package/libmad/libmad-0.15.1b-optimization.patch.avr32

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:

Sorry, the patch is too large to include (2942 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19716

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-08-01 22:34 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-08-01 22:34 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-01 15:34:50 -0700 (Wed, 01 Aug 2007)
New Revision: 19394

Log:
Build correct target in libmad

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-08-01 19:15:14 UTC (rev 19393)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-08-01 22:34:50 UTC (rev 19394)
@@ -39,20 +39,19 @@
 	rm -f $@
 	$(MAKE) -C $(LIBMAD_DIR)
 
-$(STAGING_DIR)/usr/lib/libmad.0: $(LIBMAD_DIR)/libmad.la
+$(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install
 
-$(TARGET_DIR)/usr/lib/libmad.0: $(STAGING_DIR)/usr/lib/libmad.0
-	cp -dpf $(STAGING_DIR)/usr/lib/libmad $(TARGET_DIR)/usr/lib/
-	cp -dpf $(STAGING_DIR)/usr/lib/libmad.0* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmad*
 
-$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.0
+$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so
 	mkdir -p $(TARGET_DIR)/usr/include
 	cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/
 	cp -dpf $(STAGING_DIR)/usr/lib/libmad.*a $(TARGET_DIR)/usr/lib/
 
-libmad:	uclibc $(TARGET_DIR)/usr/lib/libmad.0
+libmad:	uclibc $(TARGET_DIR)/usr/lib/libmad.so
 
 libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a
 

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-07-28 17:09 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-07-28 17:09 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-28 10:09:44 -0700 (Sat, 28 Jul 2007)
New Revision: 19301

Log:
Use correct extension for libmad library

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-07-28 17:05:38 UTC (rev 19300)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-07-28 17:09:44 UTC (rev 19301)
@@ -16,6 +16,7 @@
 $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
 	$(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(CONFIG_UPDATE) $(LIBMAD_DIR)
+	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/libmad/ libmad-$(LIBMAD_VERSION)\*.patch\*
 	touch $@
 
 $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
@@ -28,29 +29,30 @@
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--sysconfdir=/etc \
+		--disable-debugging \
+		--enable-speed \
 		$(DISABLE_NLS) \
 	);
 	touch $@
 
 $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
-	$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_DIR)
-	@touch -c $@
+	$(MAKE) -C $(LIBMAD_DIR)
 
-$(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la
+$(STAGING_DIR)/usr/lib/libmad.0: $(LIBMAD_DIR)/libmad.la
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install
 
-$(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so
-	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/
-	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmad.so*
-	@touch -c $@
+$(TARGET_DIR)/usr/lib/libmad.0: $(STAGING_DIR)/usr/lib/libmad.0
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad $(TARGET_DIR)/usr/lib/
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.0* $(TARGET_DIR)/usr/lib/
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmad*
 
-$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so
+$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.0
 	mkdir -p $(TARGET_DIR)/usr/include
 	cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/
 	cp -dpf $(STAGING_DIR)/usr/lib/libmad.*a $(TARGET_DIR)/usr/lib/
 
-libmad:	uclibc $(TARGET_DIR)/usr/lib/libmad.so
+libmad:	uclibc $(TARGET_DIR)/usr/lib/libmad.0
 
 libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a
 

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-07-28 16:49 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-07-28 16:49 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-28 09:49:16 -0700 (Sat, 28 Jul 2007)
New Revision: 19299

Log:
Add avr32 patch for libmad

Added:
   trunk/buildroot/package/libmad/libmad-0.15.1b-avr32-optimization.patch


Changeset:

Sorry, the patch is too large to include (2927 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19299

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-07-23  7:57 ulf at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: ulf at uclibc.org @ 2007-07-23  7:57 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-23 00:57:31 -0700 (Mon, 23 Jul 2007)
New Revision: 19198

Log:
Update libmad configuration + cleanup

Modified:
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-07-23 07:56:00 UTC (rev 19197)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-07-23 07:57:31 UTC (rev 19198)
@@ -15,7 +15,8 @@
 
 $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
 	$(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(LIBMAD_DIR)/.unpacked
+	$(CONFIG_UPDATE) $(LIBMAD_DIR)
+	touch $@
 
 $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
 	(cd $(LIBMAD_DIR); rm -rf config.cache; \
@@ -29,11 +30,12 @@
 		--sysconfdir=/etc \
 		$(DISABLE_NLS) \
 	);
-	touch $(LIBMAD_DIR)/.configured
+	touch $@
 
 $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
 	$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_DIR)
+	@touch -c $@
 
 $(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install
@@ -41,6 +43,7 @@
 $(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so
 	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmad.so*
+	@touch -c $@
 
 $(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so
 	mkdir -p $(TARGET_DIR)/usr/include

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libmad
@ 2007-05-10  8:10 jacmet at uclibc.org
  0 siblings, 0 replies; 13+ messages in thread
From: jacmet at uclibc.org @ 2007-05-10  8:10 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2007-05-10 01:10:21 -0700 (Thu, 10 May 2007)
New Revision: 18602

Log:
Cleanup. Moved header file install to LIBMAD_PACKAGE_HEADERS target like zlib

Modified:
   trunk/buildroot/package/libmad/Config.in
   trunk/buildroot/package/libmad/libmad.mk


Changeset:
Modified: trunk/buildroot/package/libmad/Config.in
===================================================================
--- trunk/buildroot/package/libmad/Config.in	2007-05-10 02:37:44 UTC (rev 18601)
+++ trunk/buildroot/package/libmad/Config.in	2007-05-10 08:10:21 UTC (rev 18602)
@@ -2,8 +2,15 @@
 	bool "libmad"
 	default n
 	help
-	  High-quality MPEG audio decoder.  All computations are performed 
-	  with fixed-point integer arithmetic, making it ideal for systems 
+	  High-quality MPEG audio decoder.  All computations are performed
+	  with fixed-point integer arithmetic, making it ideal for systems
 	  without a floating-point unit.
 
 	  http://www.underbit.com/products/mad/
+
+config BR2_PACKAGE_LIBMAD_TARGET_HEADERS
+	bool "libmad headers in target"
+	default n
+	depends on BR2_PACKAGE_LIBMAD
+	help
+	  Put headers files in the target.

Modified: trunk/buildroot/package/libmad/libmad.mk
===================================================================
--- trunk/buildroot/package/libmad/libmad.mk	2007-05-10 02:37:44 UTC (rev 18601)
+++ trunk/buildroot/package/libmad/libmad.mk	2007-05-10 08:10:21 UTC (rev 18602)
@@ -7,8 +7,7 @@
 LIBMAD_VERSION=0.15.1b
 LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz
 LIBMAD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/
-LIBMAD_DIR=$(BUILD_DIR)/${shell basename $(LIBMAD_SOURCE) .tar.gz}
-LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
+LIBMAD_DIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
 LIBMAD_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBMAD_SOURCE):
@@ -33,25 +32,40 @@
 	);
 	touch $(LIBMAD_DIR)/.configured
 
-$(LIBMAD_WORKDIR)/libmad.la: $(LIBMAD_DIR)/.configured
+$(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
-	$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_WORKDIR)
+	$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_DIR)
 
-$(LIBMAD_WORKDIR)/.installed: $(LIBMAD_WORKDIR)/libmad.la
-	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBMAD_WORKDIR) install
-	touch $(LIBMAD_WORKDIR)/.installed
+$(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install
 
-libmad:	uclibc $(LIBMAD_WORKDIR)/.installed
+$(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libmad.so*
 
+$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so
+	mkdir -p $(TARGET_DIR)/usr/include
+	cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(STAGING_DIR)/usr/lib/libmad.*a $(TARGET_DIR)/usr/lib/
+
+libmad:	uclibc $(TARGET_DIR)/usr/lib/libmad.so
+
+libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a
+
 libmad-source: $(DL_DIR)/$(LIBMAD_SOURCE)
 
 libmad-clean:
-	@if [ -d $(LIBMAD_WORKDIR)/Makefile ] ; then \
-		$(MAKE) -C $(LIBMAD_WORKDIR) clean ; \
+	@if [ -d $(LIBMAD_DIR)/Makefile ] ; then \
+		$(MAKE) -C $(LIBMAD_DIR) clean ; \
 	fi;
+	rm -f $(STAGING_DIR)/usr/lib/libmad.*
+	rm -f $(STAGING_DIR)/usr/include/mad.h
+	rm -f $(TARGET_DIR)/usr/lib/libmad.*
+	rm -f $(TARGET_DIR)/usr/include/mad.h
 
+
 libmad-dirclean:
-	rm -rf $(LIBMAD_DIR) $(LIBMAD_WORKDIR)
+	rm -rf $(LIBMAD_DIR)
 #############################################################
 #
 # Toplevel Makefile options
@@ -60,3 +74,6 @@
 ifeq ($(strip $(BR2_PACKAGE_LIBMAD)),y)
 TARGETS+=libmad
 endif
+ifeq ($(strip $(BR2_PACKAGE_LIBMAD_TARGET_HEADERS)),y)
+TARGETS+=libmad-headers
+endif

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2007-11-27 21:44 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-31  6:40 [Buildroot] svn commit: trunk/buildroot/package/libmad ulf at uclibc.org
2007-10-31  6:50 ` Hans-Christian Egtvedt
2007-10-31  7:03   ` Ulf Samuelsson
  -- strict thread matches above, loose matches on Subject: below --
2007-11-27 21:44 ulf at uclibc.org
2007-11-27 21:40 ulf at uclibc.org
2007-11-02 22:37 ulf at uclibc.org
2007-08-28 19:35 ulf at uclibc.org
2007-08-28 19:33 ulf at uclibc.org
2007-08-01 22:34 ulf at uclibc.org
2007-07-28 17:09 ulf at uclibc.org
2007-07-28 16:49 ulf at uclibc.org
2007-07-23  7:57 ulf at uclibc.org
2007-05-10  8:10 jacmet at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox