summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-03-21 11:00:54 +0000
committerFabian Groffen <grobian@gentoo.org>2010-03-21 11:00:54 +0000
commite6aa26aca76ace189afdfbf3435127e4de696258 (patch)
tree5ee1ffdb6a65dca51534e3ba57ffdb7dd4c4095f /net-libs/libsrtp/files
parentAdd in x11-libs/vte to giggle's dependencies, bug 308393. (diff)
downloadgentoo-2-e6aa26aca76ace189afdfbf3435127e4de696258.tar.gz
gentoo-2-e6aa26aca76ace189afdfbf3435127e4de696258.tar.bz2
gentoo-2-e6aa26aca76ace189afdfbf3435127e4de696258.zip
Add fixes for Darwin, marked ~ppc-macos and ~x86-macos, bug #310203
(Portage version: 2.2.00.15838-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'net-libs/libsrtp/files')
-rw-r--r--net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch18
1 files changed, 12 insertions, 6 deletions
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
index 604ea5d12bf6..43b8843603c1 100644
--- a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
+++ b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
@@ -1,6 +1,5 @@
-diff -NrU5 srtp.orig/Makefile.in srtp/Makefile.in
---- srtp.orig/Makefile.in 2009-04-15 01:46:57.000000000 +0200
-+++ srtp/Makefile.in 2009-04-15 02:07:43.000000000 +0200
+--- srtp/Makefile.in
++++ srtp/Makefile.in
@@ -65,11 +65,11 @@
@@ -14,7 +13,7 @@ diff -NrU5 srtp.orig/Makefile.in srtp/Makefile.in
$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-@@ -103,10 +103,13 @@
+@@ -103,10 +103,16 @@
libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
ar cr libsrtp.a $^
@@ -23,12 +22,15 @@ diff -NrU5 srtp.orig/Makefile.in srtp/Makefile.in
+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.1 -o libsrtp.so.1.0 $^
+
++libsrtp.dylib: $(srtpobj) $(cryptobj) $(gdoi)
++ $(CC) $(LDFLAGS) -dynamiclib -install_name $(libdir)/libsrtp.1.dylib -o libsrtp.1.0.dylib $^
++
# libcryptomath.a contains general-purpose routines that are used to
# generate tables and verify cryptoalgorithm implementations - this
# library is not meant to be included in production code
cryptomath = crypto/math/math.o crypto/math/gf2_8.o
-@@ -195,10 +198,15 @@
+@@ -195,10 +198,20 @@
$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
$(INSTALL) -d $(DESTDIR)$(libdir)
cp include/*.h $(DESTDIR)$(includedir)/srtp
@@ -39,8 +41,12 @@ diff -NrU5 srtp.orig/Makefile.in srtp/Makefile.in
+ ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so.1; \
+ ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so; \
+ fi
++ if [ -f libsrtp.1.0.dylib ]; then \
++ cp libsrtp.1.0.dylib $(DESTDIR)$(libdir)/; \
++ ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.1.dylib; \
++ ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.dylib; \
++ fi
uninstall:
rm -rf $(DESTDIR)$(includedir)/srtp
rm -rf $(DESTDIR)$(libdir)/libsrtp.a
- \ No newline at end of file