diff options
| author |   Stefan Knoblich <stkn@gentoo.org> | 2004-04-11 19:35:52 +0000 |
|---|---|---|
| committer | Stefan Knoblich <stkn@gentoo.org> | 2004-04-11 19:35:52 +0000 |
| commit | 7ef78f1156fcc4d651cd7d1ca5ea92deabd1ef1d (patch) | |
| tree | b8f30cb978699f028673eb125e7ab3b3784a9c5c /net-libs/openh323/files/openh323-1.13.5-include-order.diff | |
| parent | Bug fix release, should deprecate the amd64 patch. (Manifest recommit) (diff) | |
| download | gentoo-2-7ef78f1156fcc4d651cd7d1ca5ea92deabd1ef1d.tar.gz gentoo-2-7ef78f1156fcc4d651cd7d1ca5ea92deabd1ef1d.tar.bz2 gentoo-2-7ef78f1156fcc4d651cd7d1ca5ea92deabd1ef1d.zip | |
version bump
Diffstat (limited to 'net-libs/openh323/files/openh323-1.13.5-include-order.diff')
| -rw-r--r-- | net-libs/openh323/files/openh323-1.13.5-include-order.diff | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/net-libs/openh323/files/openh323-1.13.5-include-order.diff b/net-libs/openh323/files/openh323-1.13.5-include-order.diff new file mode 100644 index 000000000000..8ca6b7c3337c --- /dev/null +++ b/net-libs/openh323/files/openh323-1.13.5-include-order.diff @@ -0,0 +1,42 @@ +--- openh323u.mak.in.orig 2004-03-05 21:21:37.804902816 +0100 ++++ openh323u.mak.in 2004-03-05 21:25:43.476555048 +0100 +@@ -139,7 +139,6 @@ + + PWLIBDIR = @PWLIBDIR@ + OPENH323DIR = @OPENH323DIR@ +-STDCCFLAGS += @STDCCFLAGS@ + LDFLAGS += @LDFLAGS@ + ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS) + +@@ -160,6 +159,13 @@ + + #OH323_SUPPRESS_H235 = 1 + ++# ++# stkn@gentoo.org ++# oops i did it again :) ++# moved STDCCFLAGS a little bit around ++# this fixes include order problems ++# (use build dir includes before system includes...) ++# + OH323_SRCDIR = $(OPENH323DIR)/src + ifdef PREFIX + OH323_INCDIR = $(PREFIX)/include/openh323 +@@ -168,6 +174,8 @@ + endif + OH323_LIBDIR = $(OPENH323DIR)/lib + ++STDCCFLAGS += -I$(OH323_INCDIR) @STDCCFLAGS@ ++ + ifdef NOTRACE + STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN + OH323_SUFFIX = n +@@ -191,8 +199,6 @@ + LDFLAGS += -L$(OH323_LIBDIR) + LDLIBS := -l$(OH323_BASE) $(LDLIBS) + +-STDCCFLAGS += -I$(OH323_INCDIR) +- + #ifndef NO_SPEEX + ifeq ($(H323_SYSTEM_SPEEX),1) + ENDLDLIBS := -lspeex $(ENDLDLIBS) |