diff options
| author |   Stefan Knoblich <stkn@gentoo.org> | 2003-11-03 05:49:45 +0000 |
|---|---|---|
| committer | Stefan Knoblich <stkn@gentoo.org> | 2003-11-03 05:49:45 +0000 |
| commit | 62126ad75e3e884ee6b347b7a0af731470e6dc0f (patch) | |
| tree | c1ca90288e830589e526c77b5ecd6a9f9e10cae1 | |
| parent | forgot to remove selinux patch from 5.0-r4 (diff) | |
| download | gentoo-2-62126ad75e3e884ee6b347b7a0af731470e6dc0f.tar.gz gentoo-2-62126ad75e3e884ee6b347b7a0af731470e6dc0f.tar.bz2 gentoo-2-62126ad75e3e884ee6b347b7a0af731470e6dc0f.zip | |
change order of include pathes, fixes #32522
| -rw-r--r-- | net-libs/openh323/ChangeLog | 4 | ||||
| -rw-r--r-- | net-libs/openh323/Manifest | 5 | ||||
| -rw-r--r-- | net-libs/openh323/files/openh323-1.12.0-include-order.diff | 63 | ||||
| -rw-r--r-- | net-libs/openh323/openh323-1.12.0-r1.ebuild | 8 |
4 files changed, 77 insertions, 3 deletions
diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog index de37542adeec..794957cf9080 100644 --- a/net-libs/openh323/ChangeLog +++ b/net-libs/openh323/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 # $Header: + 03 Nov 2003; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.0-r1.ebuild, + files/openh323-1.12.0-include-order.diff: + change order of include pathes in openh323u.mak, this fixes bug #32522 + *openh323-1.12.2-r1 (13 Oct 2003) 13 Oct 2003; Stefan Knoblich <stkn@gentoo.org> metadata.xml, diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest index a8d28c3ac2d7..8e5b7a58d08c 100644 --- a/net-libs/openh323/Manifest +++ b/net-libs/openh323/Manifest @@ -1,7 +1,7 @@ -MD5 6109f1382f2040f2619d78e18f0f6a8c ChangeLog 4360 +MD5 721421b9de90ecbdde90f38f8b8b281e ChangeLog 4554 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267 MD5 53e0a3534865471e42d38f10d6c06525 openh323-1.11.7.ebuild 1842 -MD5 53f922646c126ff274c62ef66f4a04b1 openh323-1.12.0-r1.ebuild 2707 +MD5 2c20781a00f154e47e32e5db1b729778 openh323-1.12.0-r1.ebuild 2834 MD5 a39c20e3a19715bb753b8d9ef6b67264 openh323-1.12.2.ebuild 2793 MD5 4859f1257934ee01b381308cbb290d2d openh323-1.9.10-r1.ebuild 1117 MD5 734d7c974cf9de7584c3705c8c79b72c openh323-1.12.2-r1.ebuild 3119 @@ -11,3 +11,4 @@ MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2 68 MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68 MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68 +MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326 diff --git a/net-libs/openh323/files/openh323-1.12.0-include-order.diff b/net-libs/openh323/files/openh323-1.12.0-include-order.diff new file mode 100644 index 000000000000..a95c046a9aa3 --- /dev/null +++ b/net-libs/openh323/files/openh323-1.12.0-include-order.diff @@ -0,0 +1,63 @@ +--- openh323u.mak.in.orig 2003-11-03 04:12:31.000000000 +0100 ++++ openh323u.mak.in 2003-11-03 04:16:07.000000000 +0100 +@@ -121,11 +121,26 @@ + # + + PWLIBDIR = @PWLIBDIR@ +-STDCCFLAGS += @STDCCFLAGS@ + LDFLAGS += @LDFLAGS@ + ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS) + H323_AVCODEC = @H323_AVCODEC@ + ++# ++# stkn@gentoo.org ++# moved stuff around, this should fix problems with include order ++# blame me if this breaks things... ++# ++OH323_SRCDIR = $(OPENH323DIR)/src ++ifdef PREFIX ++OH323_INCDIR = $(PREFIX)/include/openh323 ++else ++OH323_INCDIR = $(OPENH323DIR)/include ++endif ++OH323_LIBDIR = $(OPENH323DIR)/lib ++ ++STDCCFLAGS += -I$(OH323_INCDIR) @STDCCFLAGS@ ++ ++ + ifdef LIBRARY_MAKEFILE + include $(PWLIBDIR)/make/unix.mak + else +@@ -140,16 +155,6 @@ + + #OH323_SUPPRESS_H235 = 1 + +- +-OH323_SRCDIR = $(OPENH323DIR)/src +-ifdef PREFIX +-OH323_INCDIR = $(PREFIX)/include/openh323 +-else +-OH323_INCDIR = $(OPENH323DIR)/include +-endif +-OH323_LIBDIR = $(OPENH323DIR)/lib +- +- + ifdef NOTRACE + STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN + OH323_SUFFIX = n +@@ -168,15 +173,12 @@ + endif + + +- + OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE) + OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX) + + LDFLAGS += -L$(OH323_LIBDIR) + LDLIBS := -l$(OH323_BASE) $(LDLIBS) + +-STDCCFLAGS += -I$(OH323_INCDIR) +- + + ifneq ($(OS),Nucleus) + diff --git a/net-libs/openh323/openh323-1.12.0-r1.ebuild b/net-libs/openh323/openh323-1.12.0-r1.ebuild index 124e37892f3c..5b7bb9906727 100644 --- a/net-libs/openh323/openh323-1.12.0-r1.ebuild +++ b/net-libs/openh323/openh323-1.12.0-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.5 2003/09/06 22:04:23 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.6 2003/11/03 05:49:32 stkn Exp $ + +inherit eutils IUSE="ssl" @@ -41,6 +43,10 @@ src_unpack() { unpack ${A} # enabling ffmpeg/h263 support cd ${S}; sed -i -e "s:/usr/local/include/ffmpeg:/usr/include/ffmpeg:" configure + + # change search order of include files + # fixes bug #32522 + epatch ${FILESDIR}/openh323-${PV}-include-order.diff } src_compile() { |