[SCM] rtaudio/master: Don't build static library at all; this change should also fix FTBFS on most architectures.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Jan 17 23:30:33 UTC 2012


The following commit has been merged in the master branch:
commit e62f64f6351895e55c96ab847af168ed5cdbcf54
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jan 18 00:29:45 2012 +0100

    Don't build static library at all; this change should also fix FTBFS on most architectures.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 0642c77..9183200 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -3,15 +3,28 @@ Description: Improvements to the buildsystem.
  - Rename 'tests' target to 'check' (to make
    debhelper compile tests automatically).
  - Set system-wide CFLAGS values properly.
+ - Don't build static libraries.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
 ---
- Makefile.in |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ Makefile.in |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
 
---- rtaudio-4.0.10.orig/Makefile.in
-+++ rtaudio-4.0.10/Makefile.in
-@@ -17,11 +17,11 @@ AR       = @AR@
+--- rtaudio.orig/Makefile.in
++++ rtaudio/Makefile.in
+@@ -6,29 +6,27 @@ LN = /bin/ln
+ 
+ OBJECTS	= RtAudio.o @objects@
+ 
+-STATIC = librtaudio.a
+ SHARED = @sharedlib@
+ RELEASE = 4.0.9
+ MAJOR = 4
+-LIBRARIES = $(STATIC) $(SHARED)
++LIBRARIES = $(SHARED)
+ 
+ CC       = @CXX@
+ AR       = @AR@
  RANLIB   = @RANLIB@
  
  DEFS     = @CPPFLAGS@
@@ -25,8 +38,8 @@ Forwarded: no
  	cd tests && $(MAKE) all
  
  $(LIBRARIES): $(OBJECTS)
-@@ -29,6 +29,7 @@ $(LIBRARIES): $(OBJECTS)
- 	ranlib $(STATIC)
+-	$(AR) ruv $(STATIC) $(OBJECTS)
+-	ranlib $(STATIC)
  	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
  	$(LN) -s @sharedname@ $(SHARED)
 +	$(LN) -s @sharedname@ $(SHARED).$(MAJOR)

-- 
RtAudio packaging



More information about the pkg-multimedia-commits mailing list