[SCM] rtmidi/master: Honor LDFLAGS

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ae9a230460cf0d6353f3da5fe760edee707a135f
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Wed Aug 5 00:59:19 2015 +0200

    Honor LDFLAGS

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index e19f972..3fd8184 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -7,7 +7,7 @@
  5 files changed, 43 insertions(+), 15 deletions(-)
 
 --- /dev/null
-+++ rtmidi/rtmidi.pc.in
++++ b/rtmidi.pc.in
 @@ -0,0 +1,14 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -23,9 +23,9 @@
 +Libs: -L${libdir} -l at SONAME@
 +Libs.private:
 +Cflags: @api@
---- rtmidi.orig/RtMidi.cpp
-+++ rtmidi/RtMidi.cpp
-@@ -115,7 +115,7 @@ void RtMidiIn :: openMidiApi( RtMidi::Ap
+--- a/RtMidi.cpp
++++ b/RtMidi.cpp
+@@ -115,7 +115,7 @@
  #endif
  }
  
@@ -34,7 +34,7 @@
    : RtMidi()
  {
    if ( api != UNSPECIFIED ) {
-@@ -184,7 +184,7 @@ void RtMidiOut :: openMidiApi( RtMidi::A
+@@ -184,7 +184,7 @@
  #endif
  }
  
@@ -43,8 +43,8 @@
  {
    if ( api != UNSPECIFIED ) {
      // Attempt to open the specified API.
---- rtmidi.orig/RtMidi.h
-+++ rtmidi/RtMidi.h
+--- a/RtMidi.h
++++ b/RtMidi.h
 @@ -43,6 +43,16 @@
  #ifndef RTMIDI_H
  #define RTMIDI_H
@@ -62,7 +62,7 @@
  #define RTMIDI_VERSION "2.1.0"
  
  #include <exception>
-@@ -203,7 +213,7 @@ class RtMidi
+@@ -203,7 +213,7 @@
  //
  // **************************************************************** //
  
@@ -71,7 +71,7 @@
  {
   public:
  
-@@ -345,7 +355,7 @@ class RtMidiIn : public RtMidi
+@@ -345,7 +355,7 @@
  */
  /**********************************************************************/
  
@@ -80,9 +80,9 @@
  {
   public:
  
---- rtmidi.orig/Makefile.in
-+++ rtmidi/Makefile.in
-@@ -7,32 +7,29 @@ LN = /bin/ln
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,32 +7,30 @@
  OBJECTS	= RtMidi.o
  
  LIBNAME = librtmidi
@@ -100,6 +100,7 @@
  DEFS     = @CPPFLAGS@
 -CFLAGS   = @CXXFLAGS@ -Iinclude -fPIC
 +CFLAGS   += @CXXFLAGS@ -Iinclude -fPIC
++LDFLAGS  = @LDFLAGS@
  
  PREFIX   = @prefix@
  
@@ -112,16 +113,17 @@
  $(LIBRARIES): $(OBJECTS)
 -	$(AR) ruv $(STATIC) $(OBJECTS)
 -	ranlib $(STATIC)
- 	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
+-	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
 -	$(LN) -sf @sharedname@ $(SHARED)
 -	$(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
++	$(CC) -fPIC @libflags@ $(LDFLAGS) $(OBJECTS) @LIBS@
 +	$(LN) -s @sharedname at .$(RELEASE) $(SHARED)
 +	$(LN) -s @sharedname at .$(RELEASE) $(SHARED).$(MAJOR)
  
  #	$(CC) -shared $(OBJECTS) -o $(SHARED) @LIBS@
  
---- rtmidi.orig/configure.ac
-+++ rtmidi/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -1,5 +1,6 @@
  # Process this file with autoconf to produce a configure script.
  AC_INIT(RtMidi, 2.1.0, gary at music.mcgill.ca, rtmidi)
@@ -129,7 +131,7 @@
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_SRCDIR(RtMidi.cpp)
  AC_CONFIG_FILES([rtmidi-config librtmidi.pc Makefile tests/Makefile])
-@@ -50,8 +51,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
+@@ -50,8 +51,8 @@
  AC_CANONICAL_HOST
  
  AC_SUBST( sharedlib, ["librtmidi.so"] )
@@ -140,7 +142,7 @@
  case $host in
    *-apple*)
    AC_SUBST( sharedlib, ["librtmidi.dylib"] )
-@@ -60,14 +61,20 @@ case $host in
+@@ -60,14 +61,20 @@
  esac
  
  AC_SUBST( api, [""] )

-- 
RtMidi packaging