1 |
ultrabug 12/10/29 13:41:52 |
2 |
|
3 |
Modified: corosync-2.0.0-docs.patch |
4 |
Removed: corosync-2.0.0-rpath.patch |
5 |
Log: |
6 |
Bump corosync-2 series for testing |
7 |
|
8 |
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B658FA13) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 sys-cluster/corosync/files/corosync-2.0.0-docs.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-2.0.0-docs.patch?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-2.0.0-docs.patch?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-2.0.0-docs.patch?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: corosync-2.0.0-docs.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/corosync/files/corosync-2.0.0-docs.patch,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- corosync-2.0.0-docs.patch 16 May 2012 12:39:47 -0000 1.1 |
24 |
+++ corosync-2.0.0-docs.patch 29 Oct 2012 13:41:52 -0000 1.2 |
25 |
@@ -1,19 +1,17 @@ |
26 |
-Make docs optional |
27 |
- |
28 |
---- configure.ac |
29 |
-+++ configure.ac |
30 |
-@@ -432,7 +432,7 @@ |
31 |
- fi |
32 |
+--- a/configure.ac 2012-10-29 14:34:48.200093085 +0100 |
33 |
++++ b/configure.ac 2012-10-29 14:37:05.997077034 +0100 |
34 |
+@@ -591,7 +591,7 @@ |
35 |
+ INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync" |
36 |
|
37 |
# final build of *FLAGS |
38 |
--CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \ |
39 |
-+CFLAGS="$ENV_CFLAGS $OS_CFLAGS \ |
40 |
- $COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS" |
41 |
- CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS" |
42 |
- LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS" |
43 |
-@@ -458,7 +458,10 @@ |
44 |
- AC_SUBST([DARWIN_OPTS]) |
45 |
- AC_SUBST([SOLARIS_OPTS]) |
46 |
+-CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \ |
47 |
++CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $OS_CFLAGS \ |
48 |
+ $COVERAGE_CFLAGS $EXTRA_WARNINGS \ |
49 |
+ $WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \ |
50 |
+ $SNMP_INCLUDES" |
51 |
+@@ -616,7 +616,10 @@ |
52 |
+ AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}") |
53 |
+ AC_SUBST([NSS_LDFLAGS]) |
54 |
|
55 |
-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}") |
56 |
+AC_ARG_ENABLE([doc], |
57 |
@@ -23,14 +21,14 @@ |
58 |
|
59 |
AC_SUBST([LINT_FLAGS]) |
60 |
|
61 |
---- Makefile.am |
62 |
-+++ Makefile.am |
63 |
-@@ -46,8 +46,6 @@ |
64 |
- config.guess config.sub missing install-sh \ |
65 |
- autoheader automake autoconf test_lense.sh |
66 |
+--- a/Makefile.am 2012-10-29 14:34:48.200093085 +0100 |
67 |
++++ b/Makefile.am 2012-10-29 14:37:16.236853385 +0100 |
68 |
+@@ -48,8 +48,6 @@ |
69 |
+ autoheader automake autoconf test_lense.sh \ |
70 |
+ autoscan.log configure.scan ltmain.sh |
71 |
|
72 |
-dist_doc_DATA = LICENSE INSTALL README.recovery SECURITY TODO AUTHORS |
73 |
- |
74 |
SUBDIRS = include common_lib lib exec tools test cts pkgconfig \ |
75 |
- man init conf |
76 |
+ man init conf qdevices |