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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download) (as text)
Mon Sep 6 14:45:53 2010 UTC (9 years, 5 months ago) by chainsaw
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Version bump. Now compiles again in full debug mode; closes bug #335790 by Luca Postregna.
(Portage version: 2.1.8.3/cvs/Linux x86_64)

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

  ViewVC Help
Powered by ViewVC 1.1.20