diff options
| author |   Gustavo Zacarias <gustavoz@gentoo.org> | 2007-04-27 19:38:08 +0000 |
|---|---|---|
| committer | Gustavo Zacarias <gustavoz@gentoo.org> | 2007-04-27 19:38:08 +0000 |
| commit | 7aaa2eeff45ce0635b7ee77cf2c5fbbcaca03b1c (patch) | |
| tree | 3fbf22ec07a0cb096178929bb830c08753f1dca1 | |
| parent | Use autoload for functions. (diff) | |
| download | gentoo-2-7aaa2eeff45ce0635b7ee77cf2c5fbbcaca03b1c.tar.gz gentoo-2-7aaa2eeff45ce0635b7ee77cf2c5fbbcaca03b1c.tar.bz2 gentoo-2-7aaa2eeff45ce0635b7ee77cf2c5fbbcaca03b1c.zip | |
Fix H323 for real wrt #176259
(Portage version: 2.1.2.2)
| -rw-r--r-- | net-misc/asterisk/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff | 29 |
2 files changed, 32 insertions, 3 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index d69c2878b33e..b288187b786a 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/asterisk # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.160 2007/04/26 22:14:26 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.161 2007/04/27 19:38:08 gustavoz Exp $ + + 27 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> + files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff: + Fix H323 for real wrt #176259 26 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> -files/1.2.0/asterisk-1.2.17-ASA-2007-011.patch, diff --git a/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff b/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff index 56205288050c..51fec7433aa3 100644 --- a/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff +++ b/net-misc/asterisk/files/1.2.0/asterisk-1.2.17-h323-dumb-makefile.diff @@ -1,7 +1,25 @@ diff -Nura asterisk-1.2.17/channels/h323/Makefile asterisk-1.2.17.h323/channels/h323/Makefile --- asterisk-1.2.17/channels/h323/Makefile 2007-03-06 12:17:16.000000000 -0300 -+++ asterisk-1.2.17.h323/channels/h323/Makefile 2007-04-19 16:33:25.113788190 -0300 -@@ -31,7 +32,6 @@ ++++ asterisk-1.2.17.h323/channels/h323/Makefile 2007-04-27 16:08:27.481923054 -0300 +@@ -12,15 +12,13 @@ + STDCCFLAGS += -fPIC + #OPTCCFLAGS += + CFLAGS += -pipe ++CXXFLAGS += -I/usr/include/openh323 + TARGET += libchanh323.a + TARGET += Makefile.ast + SOURCES = ast_h323.cxx ++OBJS = ast_h323.o + OBJDIR = . + +-ifndef OPENH323DIR +-OPENH323DIR=$(HOME)/openh323 +-endif +- + clean: + rm -f *.so *.o .depend + +@@ -31,13 +29,12 @@ touch $(SOURCES) libchanh323.a: $(OBJS) @@ -9,3 +27,10 @@ diff -Nura asterisk-1.2.17/channels/h323/Makefile asterisk-1.2.17.h323/channels/ ar crv $@ $(OBJS) Makefile.ast: FORCE + @echo H323CFLAGS = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp + @echo H323LDFLAGS = $(CFLAGS) $(LDFLAGS) >>$@.tmp +- @echo H323LDLIBS = $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) >>$@.tmp ++ @echo H323LDLIBS = $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) -lopenh323 -lpt >>$@.tmp + @if [ -r $@ ] && cmp -s $@ $@.tmp; then rm -f $@.tmp; else mv -f $@.tmp $@; fi + + FORCE: |