[SCM] lame/master: remove chunks modifying */Makefile.in from parallel-builds-fix.patch, we are calling autoreconf anyway
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Mon Feb 9 06:12:39 UTC 2015
The following commit has been merged in the master branch:
commit 0e2579f436449cd04d6e58b89d1efe56b7f562a5
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date: Mon Feb 9 06:52:50 2015 +0100
remove chunks modifying */Makefile.in from parallel-builds-fix.patch, we are calling autoreconf anyway
diff --git a/debian/patches/parallel-builds-fix.patch b/debian/patches/parallel-builds-fix.patch
index 3a64c0b..76b0a82 100644
--- a/debian/patches/parallel-builds-fix.patch
+++ b/debian/patches/parallel-builds-fix.patch
@@ -28,28 +28,3 @@ Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/libmp3lame/i386/Makefi
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- a/libmp3lame/i386/Makefile.in
-+++ b/libmp3lame/i386/Makefile.in
-@@ -218,6 +218,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 \
-@@ -526,11 +527,10 @@
- $(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
-
- .nas.lo: $< nasm.h
-- mkdir -p .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)
--
lame packaging
More information about the pkg-multimedia-commits
mailing list