X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibsrtp%2Fpatches%2F1008_shared-lib.patch;h=a165d4af721d3d90b741e53191ae0ad904056cc9;hb=722ea9b644cf53871b725b13794e19f6512886ac;hp=96a13ca6ab5063465dba3422f6a3c53ffdb7d04d;hpb=f658a3266b8d6d14e2a5bf64e6659b6284783d52;p=feed%2Ftelephony.git

diff --git a/libs/libsrtp/patches/1008_shared-lib.patch b/libs/libsrtp/patches/1008_shared-lib.patch
index 96a13ca..a165d4a 100644
--- a/libs/libsrtp/patches/1008_shared-lib.patch
+++ b/libs/libsrtp/patches/1008_shared-lib.patch
@@ -1,10 +1,6 @@
-Description: Hack build routines to compile shared library
-Author: loki_val and solar
-Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
-Last-Update: 2010-03-19
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -15,7 +15,7 @@
+@@ -19,7 +19,7 @@
  
  .PHONY: all test build_table_apps
  
@@ -13,43 +9,3 @@ Last-Update: 2010-03-19
  
  runtest: build_table_apps test
  	@echo "running libsrtp test applications..."
-@@ -67,7 +67,7 @@ libdir = @libdir@
- # implicit rules for object files and test apps
- 
- %.o: %.c
--	$(COMPILE) -c $< -o $@
-+	$(COMPILE) -fPIC -c $< -o $@
- 
- %$(EXE): %.c
- 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-@@ -105,6 +105,9 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi
- 	ar cr libsrtp.a $^
- 	$(RANLIB) libsrtp.a
- 
-+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0  $^
-+
- # 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
-@@ -197,6 +200,11 @@ install:
- 	cp include/*.h $(DESTDIR)$(includedir)/srtp  
- 	cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+	if [ -f libsrtp.so.0.0 ]; then \
-+		cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \
-+		ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \
-+		ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \
-+	fi
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(includedir)/srtp
-@@ -204,7 +212,7 @@ uninstall:
- 
- clean:
- 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
--        libcryptomath.a libsrtp.a core *.core test/core
-+        libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core
- 	for a in * */* */*/*; do			\
-               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
-         done;