Date: Tue, 14 Apr 2015 22:24:44 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384031 - in head/net/libsrtp: . files Message-ID: <201504142224.t3EMOiuf041928@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Tue Apr 14 22:24:44 2015 New Revision: 384031 URL: https://svnweb.freebsd.org/changeset/ports/384031 Log: Only use -fPIC, when compiling shared objects, not static ones. Implement regression-check target (also known under other aliases) using upstream's self-tests. Modified: head/net/libsrtp/Makefile head/net/libsrtp/files/patch-Makefile.in Modified: head/net/libsrtp/Makefile ============================================================================== --- head/net/libsrtp/Makefile Tue Apr 14 21:51:00 2015 (r384030) +++ head/net/libsrtp/Makefile Tue Apr 14 22:24:44 2015 (r384031) @@ -4,6 +4,7 @@ PORTNAME= libsrtp DISTVERSIONPREFIX= v DISTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= alexander@brovikov.ru @@ -40,4 +41,7 @@ post-build: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} shared_library) +check test runtest regression-test: build + ${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${MAKE_CMD} -C ${WRKSRC} runtest + .include <bsd.port.mk> Modified: head/net/libsrtp/files/patch-Makefile.in ============================================================================== --- head/net/libsrtp/files/patch-Makefile.in Tue Apr 14 21:51:00 2015 (r384030) +++ head/net/libsrtp/files/patch-Makefile.in Tue Apr 14 22:24:44 2015 (r384031) @@ -1,6 +1,15 @@ ---- Makefile.in.orig 2015-03-11 14:02:12 UTC -+++ Makefile.in -@@ -84,12 +84,11 @@ pkgconfig_DATA = libsrtp.pc +--- Makefile.in 2015-03-11 14:02:12 UTC ++++ Makefile.in 2015-04-14 17:56:33 -0400 +@@ -44,7 +44,7 @@ + CC = @CC@ + INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include + DEFS = @DEFS@ +-CPPFLAGS= -fPIC @CPPFLAGS@ ++CPPFLAGS= @CPPFLAGS@ + CFLAGS = @CFLAGS@ + LIBS = @LIBS@ + LDFLAGS = -L. @LDFLAGS@ +@@ -84,12 +84,11 @@ endif SHAREDLIBVERSION = 1 @@ -14,3 +23,22 @@ SHAREDLIB_DIR = $(bindir) SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a SHAREDLIBVERSION = +@@ -108,6 +107,9 @@ + %.o: %.c + $(COMPILE) -c $< -o $@ + ++%.So: %.c ++ $(COMPILE) -DPIC -fPIC -c $< -o $@ ++ + %$(EXE): %.c + $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) + +@@ -143,7 +145,7 @@ + ar cr libsrtp.a $^ + $(RANLIB) libsrtp.a + +-libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi) ++libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So) + $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ + $^ $(LDFLAGS) $(LIBS) + if [ -n "$(SHAREDLIBVERSION)" ]; then \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504142224.t3EMOiuf041928>