* [gentoo-commits] gentoo-x86 commit in www-misc/mergelog/files: mergelog-4.5-asneeded.patch
@ 2009-07-05 20:05 Benedikt Boehm (hollow)
0 siblings, 0 replies; 3+ messages in thread
From: Benedikt Boehm (hollow) @ 2009-07-05 20:05 UTC (permalink / raw
To: gentoo-commits
hollow 09/07/05 20:05:11
Added: mergelog-4.5-asneeded.patch
Log:
fix #248482
(Portage version: 2.2_rc33/cvs/Linux i686)
Revision Changes Path
1.1 www-misc/mergelog/files/mergelog-4.5-asneeded.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?rev=1.1&content-type=text/plain
Index: mergelog-4.5-asneeded.patch
===================================================================
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-misc/mergelog/files: mergelog-4.5-asneeded.patch
@ 2012-11-30 17:30 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2012-11-30 17:30 UTC (permalink / raw
To: gentoo-commits
pinkbyte 12/11/30 17:30:04
Modified: mergelog-4.5-asneeded.patch
Log:
Fix as-needed patch for newer autoconf
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 www-misc/mergelog/files/mergelog-4.5-asneeded.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?r1=1.1&r2=1.2
Index: mergelog-4.5-asneeded.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mergelog-4.5-asneeded.patch 5 Jul 2009 20:05:11 -0000 1.1
+++ mergelog-4.5-asneeded.patch 30 Nov 2012 17:30:04 -0000 1.2
@@ -1,15 +1,3 @@
-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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-misc/mergelog/files: mergelog-4.5-asneeded.patch
@ 2012-11-30 17:50 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2012-11-30 17:50 UTC (permalink / raw
To: gentoo-commits
pinkbyte 12/11/30 17:50:40
Modified: mergelog-4.5-asneeded.patch
Log:
Revert as-needed patch back for properly building in new revision
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.3 www-misc/mergelog/files/mergelog-4.5-asneeded.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch?r1=1.2&r2=1.3
Index: mergelog-4.5-asneeded.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-misc/mergelog/files/mergelog-4.5-asneeded.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mergelog-4.5-asneeded.patch 30 Nov 2012 17:30:04 -0000 1.2
+++ mergelog-4.5-asneeded.patch 30 Nov 2012 17:50:40 -0000 1.3
@@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-30 17:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-30 17:30 [gentoo-commits] gentoo-x86 commit in www-misc/mergelog/files: mergelog-4.5-asneeded.patch Sergey Popov (pinkbyte)
-- strict thread matches above, loose matches on Subject: below --
2012-11-30 17:50 Sergey Popov (pinkbyte)
2009-07-05 20:05 Benedikt Boehm (hollow)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox