← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/oss4/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/liboss4-salsa.patch

  • Committer: Bazaar Package Importer
  • Author(s): Stefano Rivera
  • Date: 2011-06-16 20:37:48 UTC
  • mfrom: (5.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110616203748-jbrxik6ql33z54co
Tags: 4.2-build2004-1ubuntu1
https://launchpad.net/bugs/746048
https://launchpad.net/bugs/770972
* Merge from Debian unstable.
  - Supports our current kernel (LP: #746048)
  Remaining changes:
  - debian/oss4-dkms.dkms.in: s/source/build/ in Kernel headers paths.
* ld-as-needed.patch: Re-order CC arguments to enable building with ld
  --as-needed (LP: #770972)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/liboss4-salsa.patch
 
1
Rename libsalsa into liboss4-salsa (the former would conflict for no good reason
 
2
with another package in Debian).
 
3
 
 
4
Add rpath to /usr/lib/oss4-libsalsa, where the internal lib libOSSlib resides
 
5
(as agreed on with ftp-master).
 
6
 
 
7
Index: oss4-4.2-build2004/lib/libsalsa/Makefile
 
8
===================================================================
 
9
--- oss4-4.2-build2004.orig/lib/libsalsa/Makefile       2011-06-14 11:33:24.000000000 -0500
 
10
+++ oss4-4.2-build2004/lib/libsalsa/Makefile    2011-06-14 11:33:24.000000000 -0500
 
11
@@ -46,7 +46,7 @@
 
12
                $(LIBTOOL) --mode=compile ${CC} $(CFLAGS) -c rawmidi.c 
 
13
 
 
14
 libsalsa.la:   $(LOBJECTS)
 
15
-               $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
 
16
+               $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -R /usr/lib/oss4-libsalsa -Wl,--version-script=Versions -version-info 2:0:0 -o liboss4-salsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
 
17
 
 
18
 install:       libsalsa.la
 
19
                $(LIBTOOL) cp libsalsa.la /usr/lib