[SCM] lame/master: Fix build failures on i386 using parallel builds. Failures were caused by race condition between testing for directory, and creating directory.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c1b3ad94e9e92db5f1bfbd1e75847c5bdfaab39c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Jul 29 16:12:34 2011 -0400

    Fix build failures on i386 using parallel builds.
    Failures were caused by race condition between testing for directory, and
    creating directory.

diff --git a/debian/changelog b/debian/changelog
index d67584a..51fdc6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lame (3.98.4+repack2-2) unstable; urgency=low
+
+  * Fix parallel builds on i386.
+
+ -- Andres Mejia <amejia at debian.org>  Fri, 29 Jul 2011 15:43:25 -0400
+
 lame (3.98.4+repack2-1) unstable; urgency=low
 
   * Update debian/copyright to reflect replacement of portableio code from
diff --git a/debian/patches/parallel-builds-fix.patch b/debian/patches/parallel-builds-fix.patch
new file mode 100644
index 0000000..5bf137a
--- /dev/null
+++ b/debian/patches/parallel-builds-fix.patch
@@ -0,0 +1,53 @@
+Description: Fix race condition causing build failures on i386.
+Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches/parallel-builds-fix.patch
+
+--- a/libmp3lame/i386/Makefile.am
++++ b/libmp3lame/i386/Makefile.am
+@@ -15,6 +15,7 @@
+ if HAVE_NASM
+ noinst_LTLIBRARIES = liblameasmroutines.la
+ liblameasmroutines_la_SOURCES = $(nasm_sources)
++liblameasmroutines_la_DEPENDENCIES = $(nasm_sources:.nas.lo)
+ am_liblameasmroutines_la_OBJECTS = \
+ 	choose_table$U.lo \
+ 	cpu_feat$U.lo \
+@@ -52,11 +53,10 @@
+ 	$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
+ 
+ .nas.lo: $< nasm.h
+-	test -d .libs || mkdir .libs
+ 	$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)' >$@
+-	$(ECHO) "pic_object='.libs/$*.o'" >>$@
+-	$(ECHO) "non_pic_object='.libs/$*.o'" >>$@
+-	$(NASM) $(NASMFLAGS) $< -o .libs/$*.o -l $@.lst
++	$(ECHO) "pic_object='$*.o'" >>$@
++	$(ECHO) "non_pic_object='$*.o'" >>$@
++	$(NASM) $(NASMFLAGS) $< -o $*.o -l $@.lst
+ 
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- a/libmp3lame/i386/Makefile.in
++++ b/libmp3lame/i386/Makefile.in
+@@ -213,6 +213,7 @@
+ 
+ @HAVE_NASM_TRUE at noinst_LTLIBRARIES = liblameasmroutines.la
+ @HAVE_NASM_TRUE at liblameasmroutines_la_SOURCES = $(nasm_sources)
++ at HAVE_NASM_TRUE@liblameasmroutines_la_DEPENDENCIES = $(nasm_sources:.nas.lo)
+ @HAVE_NASM_TRUE at am_liblameasmroutines_la_OBJECTS = \
+ @HAVE_NASM_TRUE@	choose_table$U.lo \
+ @HAVE_NASM_TRUE@	cpu_feat$U.lo \
+@@ -515,11 +516,10 @@
+ 	$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
+ 
+ .nas.lo: $< nasm.h
+-	test -d .libs || mkdir .libs
+ 	$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)' >$@
+-	$(ECHO) "pic_object='.libs/$*.o'" >>$@
+-	$(ECHO) "non_pic_object='.libs/$*.o'" >>$@
+-	$(NASM) $(NASMFLAGS) $< -o .libs/$*.o -l $@.lst
++	$(ECHO) "pic_object='$*.o'" >>$@
++	$(ECHO) "non_pic_object='$*.o'" >>$@
++	$(NASM) $(NASMFLAGS) $< -o $*.o -l $@.lst
+ 
+ #$(OBJECTS): libtool
+ #libtool: $(LIBTOOL_DEPS)
diff --git a/debian/patches/series b/debian/patches/series
index 8654414..5d351a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 06-sndfile-stdin.patch
 07-field-width-fix.patch
 license-ouput-change.patch
+parallel-builds-fix.patch

-- 
lame packaging