diff options
author | Michael Gilbert <mgilbert@debian.org> | 2012-12-16 01:04:52 +0000 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2013-05-03 21:08:44 +0400 |
commit | 76c556de8989df3905e066f13cd91190093402ff (patch) | |
tree | f417353f49aa7ad35745c6cdd6148f1651b0a903 /debian/patches/liboss4-salsa.patch | |
parent | 1058def8e7827e56ce4a70afb4aeacb5dc44148f (diff) | |
download | oss4-76c556de8989df3905e066f13cd91190093402ff.tar.gz |
Imported Debian patch 4.2-build2006-2+deb7u1debian/4.2-build2006-2+deb7u1
Diffstat (limited to 'debian/patches/liboss4-salsa.patch')
-rw-r--r-- | debian/patches/liboss4-salsa.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/debian/patches/liboss4-salsa.patch b/debian/patches/liboss4-salsa.patch new file mode 100644 index 0000000..5eeb628 --- /dev/null +++ b/debian/patches/liboss4-salsa.patch @@ -0,0 +1,19 @@ +Rename libsalsa into liboss4-salsa (the former would conflict for no good reason +with another package in Debian). + +Add rpath to /usr/lib/oss4-libsalsa, where the internal lib libOSSlib resides +(as agreed on with ftp-master). + +Index: oss4-4.2-build2004/lib/libsalsa/Makefile +=================================================================== +--- oss4-4.2-build2004.orig/lib/libsalsa/Makefile 2011-06-14 11:33:24.000000000 -0500 ++++ oss4-4.2-build2004/lib/libsalsa/Makefile 2011-06-14 11:33:24.000000000 -0500 +@@ -46,7 +46,7 @@ + $(LIBTOOL) --mode=compile ${CC} $(CFLAGS) -c rawmidi.c + + libsalsa.la: $(LOBJECTS) +- $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib ++ $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -R /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/oss4-libsalsa -Wl,--version-script=Versions -version-info 2:0:0 -o liboss4-salsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib + + install: libsalsa.la + $(LIBTOOL) cp libsalsa.la /usr/lib |