| 1 |
xarthisius 10/06/26 16:25:19 |
| 2 |
|
| 3 |
Added: corosync-docs.patch corosync-ldflags.patch |
| 4 |
Log: |
| 5 |
Version bump. Moved from scarabeus' overlay. Fixing several QA issues |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-cluster/corosync/files/corosync-docs.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-docs.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-docs.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: corosync-docs.patch |
| 15 |
=================================================================== |
| 16 |
Make docs optional |
| 17 |
|
| 18 |
--- configure.ac |
| 19 |
+++ configure.ac |
| 20 |
@@ -432,7 +432,7 @@ |
| 21 |
fi |
| 22 |
|
| 23 |
# final build of *FLAGS |
| 24 |
-CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \ |
| 25 |
+CFLAGS="$ENV_CFLAGS $OS_CFLAGS \ |
| 26 |
$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS" |
| 27 |
CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS" |
| 28 |
LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS" |
| 29 |
@@ -458,7 +458,10 @@ |
| 30 |
AC_SUBST([DARWIN_OPTS]) |
| 31 |
AC_SUBST([SOLARIS_OPTS]) |
| 32 |
|
| 33 |
-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}") |
| 34 |
+AC_ARG_ENABLE([doc], |
| 35 |
+ AS_HELP_STRING([--enable-doc],[Build html documentation]) |
| 36 |
+) |
| 37 |
+AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] ) |
| 38 |
|
| 39 |
AC_SUBST([LINT_FLAGS]) |
| 40 |
|
| 41 |
--- Makefile.am |
| 42 |
+++ Makefile.am |
| 43 |
@@ -41,9 +41,6 @@ |
| 44 |
config.guess config.sub missing install-sh \ |
| 45 |
autoheader automake autoconf |
| 46 |
|
| 47 |
-dist_doc_DATA = LICENSE INSTALL README.devmap \ |
| 48 |
- README.recovery SECURITY TODO AUTHORS |
| 49 |
- |
| 50 |
corosysconfdir = ${COROSYSCONFDIR} |
| 51 |
|
| 52 |
corosysconf_DATA = conf/corosync.conf.example |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.1 sys-cluster/corosync/files/corosync-ldflags.patch |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-ldflags.patch?rev=1.1&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-ldflags.patch?rev=1.1&content-type=text/plain |
| 60 |
|
| 61 |
Index: corosync-ldflags.patch |
| 62 |
=================================================================== |
| 63 |
Respect LDFLAGS |
| 64 |
|
| 65 |
--- exec/Makefile.am |
| 66 |
+++ exec/Makefile.am |
| 67 |
@@ -81,7 +81,7 @@ |
| 68 |
|
| 69 |
if BUILD_DARWIN |
| 70 |
%.lcrso: %.o |
| 71 |
- $(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@ |
| 72 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@ |
| 73 |
|
| 74 |
libtotem_pg.so.$(SONAME): $(TOTEM_OBJS) |
| 75 |
$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread |
| 76 |
@@ -122,7 +122,7 @@ |
| 77 |
else |
| 78 |
|
| 79 |
%.lcrso: %.o |
| 80 |
- $(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@ |
| 81 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@ |
| 82 |
|
| 83 |
libtotem_pg.so.$(SONAME): $(TOTEM_OBJS) |
| 84 |
$(CC) -shared -o $@ \ |
| 85 |
--- lcr/Makefile.am |
| 86 |
+++ lcr/Makefile.am |
| 87 |
@@ -52,24 +52,24 @@ |
| 88 |
if BUILD_DARWIN |
| 89 |
|
| 90 |
%.lcrso: %.o |
| 91 |
- $(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@ |
| 92 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -bundle -bundle_loader ./test $^ -o $@ |
| 93 |
else |
| 94 |
|
| 95 |
if BUILD_SOLARIS |
| 96 |
|
| 97 |
%.lcrso: %.o |
| 98 |
- $(CC) $(CFLAGS) -shared $^ -o $@ |
| 99 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@ |
| 100 |
else |
| 101 |
|
| 102 |
%.lcrso: %.o |
| 103 |
- $(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@ |
| 104 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ $^ -o $@ |
| 105 |
|
| 106 |
endif |
| 107 |
|
| 108 |
endif |
| 109 |
|
| 110 |
lint: |
| 111 |
- -splint $(LINT_FLAGS) $(CFLAGS) *.c |
| 112 |
+ -splint $(LINT_FLAGS) $(CFLAGS) $(LDFLAGS) *.c |
| 113 |
|
| 114 |
all-local: $(noinst_LCRSO) |
| 115 |
@echo Built Live Component Replacement System |
| 116 |
--- services/Makefile.am |
| 117 |
+++ services/Makefile.am |
| 118 |
@@ -68,10 +68,10 @@ |
| 119 |
|
| 120 |
else |
| 121 |
quorum_%.lcrso: %.o |
| 122 |
- $(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@ |
| 123 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@ |
| 124 |
|
| 125 |
service_%.lcrso: %.o |
| 126 |
- $(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@ |
| 127 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@ |
| 128 |
endif |
| 129 |
|
| 130 |
endif |
Archives