diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2009-07-05 20:05:12 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2009-07-05 20:05:12 +0000 |
| commit | cd0086c68c8fe493a6880e92066337f1f9ac61fb (patch) | |
| tree | 6c3b5fc785cfc5bc3338476bfc867e93758b3eb5 /www-misc/mergelog/files | |
| parent | keyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug #233618 (diff) | |
| download | gentoo-2-cd0086c68c8fe493a6880e92066337f1f9ac61fb.tar.gz gentoo-2-cd0086c68c8fe493a6880e92066337f1f9ac61fb.tar.bz2 gentoo-2-cd0086c68c8fe493a6880e92066337f1f9ac61fb.zip | |
fix #248482
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'www-misc/mergelog/files')
| -rw-r--r-- | www-misc/mergelog/files/mergelog-4.5-asneeded.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch new file mode 100644 index 000000000000..77573cc60f9e --- /dev/null +++ b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch @@ -0,0 +1,32 @@ +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 ++++ mergelog-4.5/src/Makefile.am +@@ -1,7 +1,10 @@ + bin_PROGRAMS=mergelog zmergelog + +-mergelog: mergelog.c +- $(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall mergelog.c -o $@ +- +-zmergelog: mergelog.c +- $(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall -DUSE_ZLIB mergelog.c -o $@ ++# This is a bit of a hack, but it preserves the original design of the ++# upstream Makefile.am in assuming that $VERSION will be defined in the ++# Makefile that is actually fed to make. ++AM_CPPFLAGS=-DVERSION=\"@VERSION@\" ++AM_CFLAGS=-Wall ++mergelog_SOURCES = mergelog.c ++zmergelog_SOURCES = mergelog.c ++zmergelog_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_ZLIB |