diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-11-30 17:50:40 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-30 17:50:40 +0000 |
| commit | 83cf64dd0095f5ed14c80187a2aa24367b6c8ee4 (patch) | |
| tree | db759aba89575282f04ef987c9b9e3c4c56db935 /www-misc/mergelog | |
| parent | Revision bump: EAPI 4, autotools-utils eclass, use default src_install, drop ... (diff) | |
| download | gentoo-2-83cf64dd0095f5ed14c80187a2aa24367b6c8ee4.tar.gz gentoo-2-83cf64dd0095f5ed14c80187a2aa24367b6c8ee4.tar.bz2 gentoo-2-83cf64dd0095f5ed14c80187a2aa24367b6c8ee4.zip | |
Revert as-needed patch back for properly building in new revision
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'www-misc/mergelog')
| -rw-r--r-- | www-misc/mergelog/ChangeLog | 6 | ||||
| -rw-r--r-- | www-misc/mergelog/files/mergelog-4.5-asneeded.patch | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/www-misc/mergelog/ChangeLog b/www-misc/mergelog/ChangeLog index 9b58f9661812..275522bdb416 100644 --- a/www-misc/mergelog/ChangeLog +++ b/www-misc/mergelog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/mergelog # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.13 2012/11/30 17:46:12 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.14 2012/11/30 17:50:40 pinkbyte Exp $ + + 30 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> + files/mergelog-4.5-asneeded.patch: + Revert as-needed patch back for properly building in new revision *mergelog-4.5-r2 (30 Nov 2012) diff --git a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch index bfac735fed09..77573cc60f9e 100644 --- a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch +++ b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch @@ -1,3 +1,15 @@ +Index: mergelog-4.5/configure.in +=================================================================== +--- mergelog-4.5.orig/configure.in ++++ mergelog-4.5/configure.in +@@ -10,6 +10,7 @@ AC_PROG_INSTALL() + + dnl Checks for programs. + AC_PROG_CC ++AM_PROG_CC_C_O + + dnl Checks for libraries. + dnl Replace `main' with a function in -lz: Index: mergelog-4.5/src/Makefile.am =================================================================== --- mergelog-4.5.orig/src/Makefile.am |