diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2012-10-29 13:41:52 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2012-10-29 13:41:52 +0000 |
| commit | 609c3db613f30de6bf208c0d01c1c7920dd76105 (patch) | |
| tree | a5171873fd5237770ff8dab3882532bc6f25ebb4 /sys-cluster/corosync/files | |
| parent | Version bump. Drop old. (diff) | |
| download | gentoo-2-609c3db613f30de6bf208c0d01c1c7920dd76105.tar.gz gentoo-2-609c3db613f30de6bf208c0d01c1c7920dd76105.tar.bz2 gentoo-2-609c3db613f30de6bf208c0d01c1c7920dd76105.zip | |
Bump corosync-2 series for testing
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster/corosync/files')
| -rw-r--r-- | sys-cluster/corosync/files/corosync-2.0.0-docs.patch | 38 | ||||
| -rw-r--r-- | sys-cluster/corosync/files/corosync-2.0.0-rpath.patch | 33 |
2 files changed, 18 insertions, 53 deletions
diff --git a/sys-cluster/corosync/files/corosync-2.0.0-docs.patch b/sys-cluster/corosync/files/corosync-2.0.0-docs.patch index 68de1f1b546d..66eacb821e5e 100644 --- a/sys-cluster/corosync/files/corosync-2.0.0-docs.patch +++ b/sys-cluster/corosync/files/corosync-2.0.0-docs.patch @@ -1,19 +1,17 @@ -Make docs optional - ---- configure.ac -+++ configure.ac -@@ -432,7 +432,7 @@ - fi +--- a/configure.ac 2012-10-29 14:34:48.200093085 +0100 ++++ b/configure.ac 2012-10-29 14:37:05.997077034 +0100 +@@ -591,7 +591,7 @@ + INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync" # 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]) +-CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \ ++CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $OS_CFLAGS \ + $COVERAGE_CFLAGS $EXTRA_WARNINGS \ + $WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \ + $SNMP_INCLUDES" +@@ -616,7 +616,10 @@ + AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}") + AC_SUBST([NSS_LDFLAGS]) -AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}") +AC_ARG_ENABLE([doc], @@ -23,14 +21,14 @@ Make docs optional AC_SUBST([LINT_FLAGS]) ---- Makefile.am -+++ Makefile.am -@@ -46,8 +46,6 @@ - config.guess config.sub missing install-sh \ - autoheader automake autoconf test_lense.sh +--- a/Makefile.am 2012-10-29 14:34:48.200093085 +0100 ++++ b/Makefile.am 2012-10-29 14:37:16.236853385 +0100 +@@ -48,8 +48,6 @@ + autoheader automake autoconf test_lense.sh \ + autoscan.log configure.scan ltmain.sh -dist_doc_DATA = LICENSE INSTALL README.recovery SECURITY TODO AUTHORS - SUBDIRS = include common_lib lib exec tools test cts pkgconfig \ - man init conf + man init conf qdevices diff --git a/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch b/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch deleted file mode 100644 index 4cca805066d8..000000000000 --- a/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -49,7 +49,7 @@ - - EXTRA_DIST = $(bin_SCRIPTS) corosync-xmlproc.sh corosync-notifyd.sysconfig.example - --COMMON_OPTS = -L../lib -L../common_lib -Wl,-rpath,../common_lib -+COMMON_OPTS = -L../lib -L../common_lib - - corosync_cmapctl_LDFLAGS= $(COMMON_OPTS) - corosync_cmapctl_LDADD = -lcorosync_common -lcmap $(LIBQB_LIBS) -@@ -57,10 +57,10 @@ - corosync_fplay_LDADD = $(LIBQB_LIBS) - - corosync_cfgtool_LDFLAGS= $(COMMON_OPTS) --corosync_cfgtool_LDADD = -lcfg $(LIBQB_LIBS) -+corosync_cfgtool_LDADD = -lcfg -lcorosync_common $(LIBQB_LIBS) - - corosync_cpgtool_LDFLAGS= $(COMMON_OPTS) --corosync_cpgtool_LDADD = -lcfg -lcpg $(LIBQB_LIBS) -+corosync_cpgtool_LDADD = -lcfg -lcpg -lcorosync_common $(LIBQB_LIBS) - - corosync_quorumtool_LDFLAGS = $(COMMON_OPTS) - corosync_quorumtool_LDADD = -lcmap -lcfg -lquorum -lcorosync_common \ -@@ -68,7 +68,7 @@ - - corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS) - corosync_notifyd_LDFLAGS = $(COMMON_OPTS) --corosync_notifyd_LDADD = -lcfg -lcmap \ -+corosync_notifyd_LDADD = -lcfg -lcmap -lcorosync_common \ - $(LIBQB_LIBS) $(DBUS_LIBS) $(SNMPLIBS) \ - -lquorum - |