/[gentoo-x86]/net-misc/bird/files/1.3.0-v4-v6-build.patch
Gentoo

Contents of /net-misc/bird/files/1.3.0-v4-v6-build.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Thu Mar 31 09:48:53 2011 UTC (8 years, 10 months ago) by chainsaw
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
New upstream release, adds iBGP, multipath support, layer 2 link state detection, IPv6 RAs and many bugfixes. OSPF now supports point-to-multipoint interfaces. Azamat H. Hackimov has provided completely new initscripts and important socket path fixes, closes bugs #338118 and #338188.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

1 diff -uNr bird-1.3.0.ORIG//tools/Makefile-top.in bird-1.3.0/tools/Makefile-top.in
2 --- bird-1.3.0.ORIG//tools/Makefile-top.in 2011-03-31 10:42:08.264002882 +0100
3 +++ bird-1.3.0/tools/Makefile-top.in 2011-03-31 10:42:32.083002944 +0100
4 @@ -3,16 +3,19 @@
5
6 objdir=@objdir@
7
8 -all depend tags install install-docs:
9 +all depend tags install install-docs install-bin install-bin6:
10 $(MAKE) -C $(objdir) $@
11
12 docs userdocs progdocs:
13 $(MAKE) -C doc $@
14
15 -clean:
16 - $(MAKE) -C $(objdir) clean
17 +almost-clean:
18 + $(MAKE) -C $(objdir) almost-clean
19 find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
20
21 +clean: almost-clean
22 + $(MAKE) -C $(objdir) clean
23 +
24 distclean: clean
25 $(MAKE) -C doc distclean
26 rm -rf $(objdir) autom4te.cache
27 diff -uNr bird-1.3.0.ORIG//tools/Makefile.in bird-1.3.0/tools/Makefile.in
28 --- bird-1.3.0.ORIG//tools/Makefile.in 2011-03-31 10:42:08.265002882 +0100
29 +++ bird-1.3.0/tools/Makefile.in 2011-03-31 10:42:32.083002944 +0100
30 @@ -3,13 +3,13 @@
31
32 include Rules
33
34 -.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
35 +.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
36
37 all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
38
39 -daemon: $(exedir)/bird
40 +daemon: $(exedir)/bird@SUFFIX6@
41
42 -client: $(exedir)/birdc
43 +client: $(exedir)/birdc@SUFFIX6@
44
45 bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
46
47 @@ -27,10 +27,10 @@
48 set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
49 set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
50
51 -$(exedir)/bird: $(bird-dep)
52 +$(exedir)/bird@SUFFIX6@: $(bird-dep)
53 $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
54
55 -$(exedir)/birdc: $(birdc-dep)
56 +$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
57 $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
58
59 .dir-stamp: sysdep/paths.h
60 @@ -54,25 +54,42 @@
61 tags:
62 cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
63
64 -install: all
65 +install-gen:
66 $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
67 - $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
68 +
69 +install-bin: install-gen
70 + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
71 + if test -n "@CLIENT@" ; then \
72 + $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
73 + fi
74 + if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
75 + $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
76 + else \
77 + echo "Not overwriting old bird.conf" ; \
78 + fi
79 +
80 +install-bin6: install-gen
81 + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
82 if test -n "@CLIENT@" ; then \
83 - $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
84 + $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
85 fi
86 - if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
87 - $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
88 + if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
89 + $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
90 else \
91 - echo "Not overwriting old bird@SUFFIX@.conf" ; \
92 + echo "Not overwriting old bird6.conf" ; \
93 fi
94
95 +install: all install-bin@SUFFIX6@
96 +
97 install-docs:
98 $(INSTALL) -d $(DESTDIR)/$(docdir)
99 $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
100
101 -clean:
102 +almost-clean:
103 find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
104 rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
105 +
106 +clean: almost-clean
107 rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
108
109 distclean: clean

  ViewVC Help
Powered by ViewVC 1.1.20