Archives
Archives
| From: | "Nathan Phillip Brink (binki)" <binki@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-irc/scrollz/files: scrollz-2.2-cppflags.patch scrollz-2.2-make-install.patch |
| Date: | Tue, 03 Jan 2012 03:52:17 |
| Message-Id: | 20120103035207.EEA4320033@flycatcher.gentoo.org |
| 1 | binki 12/01/03 03:52:07 |
| 2 | |
| 3 | Added: scrollz-2.2-cppflags.patch |
| 4 | scrollz-2.2-make-install.patch |
| 5 | Log: |
| 6 | Use ${CHOST}-gcc instead of gcc when compiling (fixes bug #397441 by ago). Don't use einstall() (fixes bug #397445 by ago). Add patches for parallel make install and respecting CPPFLAGS. |
| 7 | |
| 8 | (Portage version: 2.2.0_alpha82-r1/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 net-irc/scrollz/files/scrollz-2.2-cppflags.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/scrollz/files/scrollz-2.2-cppflags.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/scrollz/files/scrollz-2.2-cppflags.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: scrollz-2.2-cppflags.patch |
| 17 | =================================================================== |
| 18 | From: Nathan Phillip Brink <binki@g.o> |
| 19 | Subject: [PATCH] Respect CPPFLAGS. |
| 20 | |
| 21 | --- a/Makefile.in |
| 22 | +++ b/Makefile.in |
| 23 | @@ -68,7 +68,7 @@ |
| 24 | IRCDOC = ${IRCSHARE}/doc |
| 25 | |
| 26 | CC = @CC@ |
| 27 | -DEFS = @DEFS@ |
| 28 | +DEFS = @DEFS@ @CPPFLAGS@ |
| 29 | LIBS = @LIBS@ |
| 30 | |
| 31 | # Set this to -g if you want to be able to debug the client, otherwise |
| 32 | |
| 33 | --- a/source/Makefile.in |
| 34 | +++ b/source/Makefile.in |
| 35 | @@ -11,7 +11,7 @@ |
| 36 | LDFLAGS = @LDFLAGS@ |
| 37 | LEX = @LEX@ |
| 38 | LEXLIB = @LEXLIB@ |
| 39 | -DEFS = @DEFS@ |
| 40 | +DEFS = @DEFS@ @CPPFLAGS@ |
| 41 | LN = @LN@ |
| 42 | RM = @RM@ |
| 43 | |
| 44 | |
| 45 | |
| 46 | |
| 47 | 1.1 net-irc/scrollz/files/scrollz-2.2-make-install.patch |
| 48 | |
| 49 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/scrollz/files/scrollz-2.2-make-install.patch?rev=1.1&view=markup |
| 50 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/scrollz/files/scrollz-2.2-make-install.patch?rev=1.1&content-type=text/plain |
| 51 | |
| 52 | Index: scrollz-2.2-make-install.patch |
| 53 | =================================================================== |
| 54 | From: Nathan Phillip Brink <binki@g.o> |
| 55 | Date: 2011-01-03 |
| 56 | Subject: [PATCH] Fix parallel make install. |
| 57 | |
| 58 | --- a/Makefile.in |
| 59 | +++ b/Makefile.in |
| 60 | @@ -179,7 +179,7 @@ |
| 61 | @(cd $(DESTDIR)/$(bindir) ; $(LN) scrollz-$(VERSION) scrollz) |
| 62 | @cp doc/ScrollZ.doc $(DESTDIR)/$(IRCDOC) |
| 63 | |
| 64 | -installman: scrollz.1 |
| 65 | +installman: installdirs scrollz.1 |
| 66 | $(INSTALL) scrollz.1 $(DESTDIR)/$(mandir) |
| 67 | |
| 68 | installserv: installio |
| 69 | @@ -197,7 +197,7 @@ |
| 70 | $(DESTDIR)/$(INSTALL_SCRIPT) \ |
| 71 | $(DESTDIR)/$(HELP_DIR) $(DESTDIR)/$(IRCDOC) $(DESTDIR)/$(mandir) |
| 72 | |
| 73 | -installhelp: |
| 74 | +installhelp: installdirs |
| 75 | $(INSTALL_HELP_CMD) |
| 76 | find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx |
| 77 | find $(DESTDIR)/$(HELP_DIR) -type f -print | xargs chmod a+r |