diff options
| author | ryoon <ryoon> | 2012-12-24 14:29:24 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2012-12-24 14:29:24 +0000 |
| commit | b063998150e940a13355fce1de331a673d235e74 (patch) | |
| tree | 52471bb6145c82db233755095e68992d4889ea86 /net | |
| parent | 27d6981b534f0651552b2c43f948c1d184a98587 (diff) | |
| download | pkgsrc-b063998150e940a13355fce1de331a673d235e74.tar.gz | |
Fix build on Solaris.
* Define LDFLAGS.SunOS for missing libs
* Pass LDFLAGS to linker
Diffstat (limited to 'net')
| -rw-r--r-- | net/rtmpdump/Makefile | 4 | ||||
| -rw-r--r-- | net/rtmpdump/patches/patch-Makefile | 24 |
2 files changed, 20 insertions, 8 deletions
diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile index f60156ae512..080f70a6ea5 100644 --- a/net/rtmpdump/Makefile +++ b/net/rtmpdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/23 17:19:06 asau Exp $ +# $NetBSD: Makefile,v 1.6 2012/12/24 14:29:24 ryoon Exp $ # DISTNAME= rtmpdump-2.4 @@ -19,6 +19,8 @@ BUILD_DIRS= . librtmp WRKSRC= ${WRKDIR}/rtmpdump PKGCONFIG_OVERRIDE+= librtmp/librtmp.pc.in +LDFLAGS.SunOS+= -lnsl -lsocket + SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. diff --git a/net/rtmpdump/patches/patch-Makefile b/net/rtmpdump/patches/patch-Makefile index 6019fb689c4..e81d845c00f 100644 --- a/net/rtmpdump/patches/patch-Makefile +++ b/net/rtmpdump/patches/patch-Makefile @@ -1,10 +1,20 @@ -$NetBSD: patch-Makefile,v 1.2 2011/10/08 06:09:34 dsainty Exp $ +$NetBSD: patch-Makefile,v 1.3 2012/12/24 14:29:24 ryoon Exp $ -Libtoolize +* Pass LDFLAGS to linker +* Libtoolize ---- Makefile 2011-07-12 12:24:33.000000000 +1200 -+++ Makefile 2011-10-08 18:30:51.525361883 +1300 -@@ -44,7 +44,7 @@ +--- Makefile.orig 2011-07-12 00:24:33.000000000 +0000 ++++ Makefile +@@ -22,7 +22,7 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 + CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) +-LDFLAGS=-Wall $(XLDFLAGS) ++LDFLAGS+=-Wall $(XLDFLAGS) + + bindir=$(prefix)/bin + sbindir=$(prefix)/sbin +@@ -44,7 +44,7 @@ THREADLIB_mingw= THREADLIB=$(THREADLIB_$(SYS)) SLIBS=$(THREADLIB) $(LIBS) @@ -13,7 +23,7 @@ Libtoolize INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h EXT_posix= -@@ -60,11 +60,11 @@ +@@ -60,11 +60,11 @@ $(PROGS): $(LIBRTMP) install: $(PROGS) -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 @@ -28,7 +38,7 @@ Libtoolize clean: rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) -@@ -76,19 +76,16 @@ +@@ -76,19 +76,16 @@ $(LIBRTMP): FORCE @cd librtmp; $(MAKE) all rtmpdump: rtmpdump.o |