[gentoo-commits] gentoo-x86 commit in sys-cluster/corosync/files: corosync-docs.patch corosync-ldflags.patch

[gentoo-commits] gentoo-x86 commit in sys-cluster/corosync/files: corosync-docs.patch corosync-ldflags.patch

[Kacper Kowalik (xarthisius)]

xarthisius    10/06/26 16:25:19

  Added:                corosync-docs.patch corosync-ldflags.patch
  Log:
  Version bump. Moved from scarabeus' overlay. Fixing several QA issues
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-cluster/corosync/files/corosync-docs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-docs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-docs.patch?rev=1.1&content-type=text/plain

Index: corosync-docs.patch
===================================================================
Make docs optional

--- configure.ac
+++ configure.ac
@@ -432,7 +432,7 @@
 fi
 
 # final build of *FLAGS
-CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
+CFLAGS="$ENV_CFLAGS $OS_CFLAGS \
 	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
 CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS"
 LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
@@ -458,7 +458,10 @@
 AC_SUBST([DARWIN_OPTS])
 AC_SUBST([SOLARIS_OPTS])
 
-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
+AC_ARG_ENABLE([doc],
+  AS_HELP_STRING([--enable-doc],[Build html documentation])
+)
+AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] )
 
 AC_SUBST([LINT_FLAGS])
 
--- Makefile.am
+++ Makefile.am
@@ -41,9 +41,6 @@
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf
 
-dist_doc_DATA		= LICENSE INSTALL README.devmap \
-			  README.recovery SECURITY TODO AUTHORS
-
 corosysconfdir		= ${COROSYSCONFDIR}

 corosysconf_DATA        = conf/corosync.conf.example



1.1                  sys-cluster/corosync/files/corosync-ldflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/corosync/files/corosync-ldflags.patch?rev=1.1&content-type=text/plain

Index: corosync-ldflags.patch
===================================================================
Respect LDFLAGS

--- exec/Makefile.am
+++ exec/Makefile.am
@@ -81,7 +81,7 @@
 
 if BUILD_DARWIN
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread
@@ -122,7 +122,7 @@
 else
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) -shared -o $@ \
--- lcr/Makefile.am
+++ lcr/Makefile.am
@@ -52,24 +52,24 @@
 if BUILD_DARWIN
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -bundle -bundle_loader ./test $^ -o $@
 else
 
 if BUILD_SOLARIS
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@
 else
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ $^ -o $@
 
 endif
 
 endif
 
 lint:
-	-splint $(LINT_FLAGS) $(CFLAGS) *.c
+	-splint $(LINT_FLAGS) $(CFLAGS) $(LDFLAGS) *.c
 
 all-local: $(noinst_LCRSO)
 	@echo Built Live Component Replacement System
--- services/Makefile.am
+++ services/Makefile.am
@@ -68,10 +68,10 @@
 
 else
 quorum_%.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 endif
 
 endif