From 7e2ccca948a513f888bdaad33c0f9aec571972f7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Mar 2013 17:52:39 +0100 Subject: fix pacemaker and pacemaker-mgmt build --- package/Pacemaker-Python-GUI/Makefile | 53 ---------------------- .../Pacemaker-Python-GUI/patches/patch-configure | 11 ----- .../patches/patch-mgmt_daemon_mgmt_crm_c | 32 ------------- .../nspr/patches/patch-mozilla_nsprpub_configure | 11 +++++ package/openais/Makefile | 36 --------------- package/openais/files/openais.init | 32 ------------- package/openais/patches/patch-Makefile_in | 11 ----- package/pacemaker-mgmt/Makefile | 53 ++++++++++++++++++++++ package/pacemaker-mgmt/patches/patch-configure | 11 +++++ .../patches/patch-mgmt_daemon_mgmt_crm_c | 32 +++++++++++++ package/pacemaker/patches/patch-cib_Makefile_in | 11 +++++ package/pacemaker/patches/patch-lrmd_Makefile_in | 19 ++++++++ package/pacemaker/patches/patch-mcp_Makefile_in | 11 +++++ package/pacemaker/patches/patch-tools_Makefile_in | 12 +++++ 14 files changed, 160 insertions(+), 175 deletions(-) delete mode 100644 package/Pacemaker-Python-GUI/Makefile delete mode 100644 package/Pacemaker-Python-GUI/patches/patch-configure delete mode 100644 package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c create mode 100644 package/nspr/patches/patch-mozilla_nsprpub_configure delete mode 100644 package/openais/Makefile delete mode 100644 package/openais/files/openais.init delete mode 100644 package/openais/patches/patch-Makefile_in create mode 100644 package/pacemaker-mgmt/Makefile create mode 100644 package/pacemaker-mgmt/patches/patch-configure create mode 100644 package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c create mode 100644 package/pacemaker/patches/patch-cib_Makefile_in create mode 100644 package/pacemaker/patches/patch-lrmd_Makefile_in create mode 100644 package/pacemaker/patches/patch-mcp_Makefile_in create mode 100644 package/pacemaker/patches/patch-tools_Makefile_in diff --git a/package/Pacemaker-Python-GUI/Makefile b/package/Pacemaker-Python-GUI/Makefile deleted file mode 100644 index 5a412863e..000000000 --- a/package/Pacemaker-Python-GUI/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= Pacemaker-Python-GUI -PKG_VERSION:= 2.1.0 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 22379f78409cec9df10c25983783ef6c -PKG_DESCR:= Pacemaker GUI -PKG_SECTION:= ha -PKG_BUILDDEP:= pacemaker gnutls pam -PKG_URL:= http://hg.clusterlabs.org/pacemaker/pygui/ -PKG_SITES:= http://openadk.org/distfiles/ - -PKG_CFLINE_PACEMAKER_PYTHON_GUI:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -PKG_CFLINE_PACEMAKER_MGMTD:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC - -PKG_SUBPKGS:= PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD -PKGSD_PACEMAKER_MGMTD:= Management daemon for Pacemaker GUI - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,PACEMAKER_PYTHON_GUI,pacemaker-python-gui,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --with-initdir=/etc/init.d \ - --with-ocf-root=/usr/lib/ocf \ - --disable-fatal-warnings -TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/python2.7 \ - -I$(STAGING_DIR)/usr/include/pacemaker \ - -I$(STAGING_DIR)/usr/include/heartbeat - -pacemaker-python-gui-install: - $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin - $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui - $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui - $(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \ - $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui - $(CP) $(WRKINST)/usr/share/heartbeat-gui/* \ - $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui - $(CP) $(WRKINST)/usr/bin/*_gui \ - $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin - -pacemaker-mgmtd-install: - $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib - $(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \ - $(IDIR_PACEMAKER_MGMTD)/usr/lib - $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat - $(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \ - $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/Pacemaker-Python-GUI/patches/patch-configure b/package/Pacemaker-Python-GUI/patches/patch-configure deleted file mode 100644 index bfbf2ae69..000000000 --- a/package/Pacemaker-Python-GUI/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- Pacemaker-Python-GUI-2.1.0.orig/configure 2011-10-07 11:55:11.000000000 +0200 -+++ Pacemaker-Python-GUI-2.1.0/configure 2011-10-12 18:13:25.563559000 +0200 -@@ -5555,7 +5555,7 @@ case $libdir in - prefix|NONE|*exec_prefix*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5 - $as_echo_n "checking which lib directory to use... " >&6; } -- for aDir in lib64 lib -+ for aDir in lib - do - trydir="${exec_prefix}/${aDir}" - if diff --git a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c deleted file mode 100644 index 1882093d5..000000000 --- a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c +++ /dev/null @@ -1,32 +0,0 @@ ---- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c 2011-08-03 13:54:23.000000000 +0200 -+++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c 2011-10-07 16:15:59.000000000 +0200 -@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc) - argv[1], cib_error2string(rc)); - } else { - buffer = crm_concat("fail-count", argv[2], '-'); -- delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL, -+ delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, - NULL, buffer, NULL, FALSE); - crm_free(dest_node); - crm_free(buffer); -@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc) - sleep(2); /* wait for the refresh */ - now_s = crm_itoa(now); - update_attr(cib_conn, cib_sync_call, -- XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); -+ XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); - crm_free(now_s); - - crmd_channel->ops->destroy(crmd_channel); -@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc - strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1); - } - -+ /* - if(is_set(rsc->flags, pe_rsc_failure_ignored)) { - strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1); - } -+ */ - - ret = mgmt_msg_append(ret, buf); - break; diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure new file mode 100644 index 000000000..70465b40f --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_configure @@ -0,0 +1,11 @@ +--- nspr-4.9.5.orig/mozilla/nsprpub/configure 2012-12-19 20:21:31.000000000 +0100 ++++ nspr-4.9.5/mozilla/nsprpub/configure 2013-02-27 16:43:20.000000000 +0100 +@@ -2848,7 +2849,7 @@ esac + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else +- CROSS_COMPILE= ++ CROSS_COMPILE=1 + fi + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 diff --git a/package/openais/Makefile b/package/openais/Makefile deleted file mode 100644 index 102a7d5f6..000000000 --- a/package/openais/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= openais -PKG_VERSION:= 1.1.4 -PKG_RELEASE:= 1 -PKG_MD5SUM:= e500ad3c49fdc45d8653f864e80ed82c -PKG_DESCR:= AIS implementation -PKG_SECTION:= ha -PKG_BUILDDEP:= corosync -PKG_DEPENDS:= corosync -PKG_URL:= http://www.openais.org/ -PKG_SITES:= ftp://ftp:download@ftp.openais.org/downloads/openais-1.1.4/ - -PKG_ARCH_DEPENDS:= !avr32 - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,OPENAIS,openais,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ENV+= ac_cv_func_fnmatch_works=yes - -openais-install: - $(INSTALL_DIR) $(IDIR_OPENAIS)/usr/lib - $(CP) $(WRKINST)/usr/lib/lib*.so* \ - $(IDIR_OPENAIS)/usr/lib - $(INSTALL_DIR) $(IDIR_OPENAIS)/usr/sbin - $(CP) $(WRKINST)/usr/sbin/* \ - $(IDIR_OPENAIS)/usr/sbin - $(INSTALL_DIR) $(IDIR_OPENAIS)/usr/libexec - $(CP) $(WRKINST)/usr/libexec/* \ - $(IDIR_OPENAIS)/usr/libexec - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openais/files/openais.init b/package/openais/files/openais.init deleted file mode 100644 index 25b2d8974..000000000 --- a/package/openais/files/openais.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -#PKG openais -#INIT 80 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${corosync:-NO}" = x"NO" && exit 0 - exec sh $0 start - ;; -start) - [ -d /var/lib/corosync ] || mkdir -p /var/lib/corosync - mkdir -p /var/lib/heartbeat/crm - chown hacluster:haclient /var/lib/heartbeat/crm - chmod 775 /var/lib/heartbeat/crm - mkdir -p /var/lib/pengine - chown hacluster /var/lib/pengine - /usr/sbin/aisexec - ;; -stop) - kill $(pgrep -f corosync) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "usage: $0 {start | stop | restart}" - ;; -esac -exit $? diff --git a/package/openais/patches/patch-Makefile_in b/package/openais/patches/patch-Makefile_in deleted file mode 100644 index ab7f536bb..000000000 --- a/package/openais/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- openais-1.1.4.orig/Makefile.in 2010-08-23 21:59:26.000000000 +0200 -+++ openais-1.1.4/Makefile.in 2011-06-25 22:04:16.722682552 +0200 -@@ -285,7 +285,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc - dist_doc_DATA = LICENSE README.amf AUTHORS - corosysconfdir = ${COROSYSCONFDIR} - corosysconf_DATA = conf/amf.conf.example --SUBDIRS = include lib services test pkgconfig man init -+SUBDIRS = include lib services test pkgconfig init - RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \ - --define "_specdir $(abs_builddir)" \ - --define "_builddir $(abs_builddir)" \ diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile new file mode 100644 index 000000000..5a412863e --- /dev/null +++ b/package/pacemaker-mgmt/Makefile @@ -0,0 +1,53 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= Pacemaker-Python-GUI +PKG_VERSION:= 2.1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 22379f78409cec9df10c25983783ef6c +PKG_DESCR:= Pacemaker GUI +PKG_SECTION:= ha +PKG_BUILDDEP:= pacemaker gnutls pam +PKG_URL:= http://hg.clusterlabs.org/pacemaker/pygui/ +PKG_SITES:= http://openadk.org/distfiles/ + +PKG_CFLINE_PACEMAKER_PYTHON_GUI:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_CFLINE_PACEMAKER_MGMTD:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC + +PKG_SUBPKGS:= PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD +PKGSD_PACEMAKER_MGMTD:= Management daemon for Pacemaker GUI + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PACEMAKER_PYTHON_GUI,pacemaker-python-gui,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --with-initdir=/etc/init.d \ + --with-ocf-root=/usr/lib/ocf \ + --disable-fatal-warnings +TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/python2.7 \ + -I$(STAGING_DIR)/usr/include/pacemaker \ + -I$(STAGING_DIR)/usr/include/heartbeat + +pacemaker-python-gui-install: + $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin + $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui + $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui + $(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \ + $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui + $(CP) $(WRKINST)/usr/share/heartbeat-gui/* \ + $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui + $(CP) $(WRKINST)/usr/bin/*_gui \ + $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin + +pacemaker-mgmtd-install: + $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib + $(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \ + $(IDIR_PACEMAKER_MGMTD)/usr/lib + $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat + $(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \ + $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pacemaker-mgmt/patches/patch-configure b/package/pacemaker-mgmt/patches/patch-configure new file mode 100644 index 000000000..bfbf2ae69 --- /dev/null +++ b/package/pacemaker-mgmt/patches/patch-configure @@ -0,0 +1,11 @@ +--- Pacemaker-Python-GUI-2.1.0.orig/configure 2011-10-07 11:55:11.000000000 +0200 ++++ Pacemaker-Python-GUI-2.1.0/configure 2011-10-12 18:13:25.563559000 +0200 +@@ -5555,7 +5555,7 @@ case $libdir in + prefix|NONE|*exec_prefix*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5 + $as_echo_n "checking which lib directory to use... " >&6; } +- for aDir in lib64 lib ++ for aDir in lib + do + trydir="${exec_prefix}/${aDir}" + if diff --git a/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c b/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c new file mode 100644 index 000000000..1882093d5 --- /dev/null +++ b/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c @@ -0,0 +1,32 @@ +--- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c 2011-08-03 13:54:23.000000000 +0200 ++++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c 2011-10-07 16:15:59.000000000 +0200 +@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc) + argv[1], cib_error2string(rc)); + } else { + buffer = crm_concat("fail-count", argv[2], '-'); +- delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL, ++ delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, + NULL, buffer, NULL, FALSE); + crm_free(dest_node); + crm_free(buffer); +@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc) + sleep(2); /* wait for the refresh */ + now_s = crm_itoa(now); + update_attr(cib_conn, cib_sync_call, +- XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); ++ XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); + crm_free(now_s); + + crmd_channel->ops->destroy(crmd_channel); +@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc + strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1); + } + ++ /* + if(is_set(rsc->flags, pe_rsc_failure_ignored)) { + strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1); + } ++ */ + + ret = mgmt_msg_append(ret, buf); + break; diff --git a/package/pacemaker/patches/patch-cib_Makefile_in b/package/pacemaker/patches/patch-cib_Makefile_in new file mode 100644 index 000000000..c95cdf227 --- /dev/null +++ b/package/pacemaker/patches/patch-cib_Makefile_in @@ -0,0 +1,11 @@ +--- pacemaker-1.1.8.orig/cib/Makefile.in 2013-02-28 11:07:10.000000000 +0100 ++++ pacemaker-1.1.8/cib/Makefile.in 2013-02-28 11:23:15.000000000 +0100 +@@ -450,6 +450,8 @@ hadir = $(sysconfdir)/ha.d + halibdir = $(CRM_DAEMON_DIR) + commmoddir = $(halibdir)/modules/comm + COMMONLIBS = $(top_builddir)/lib/common/libcrmcommon.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ ++ $(top_builddir)/lib/pengine/libpe_rules.la \ + $(top_builddir)/lib/cib/libcib.la + + @BUILD_HELP_TRUE@man8_MANS = diff --git a/package/pacemaker/patches/patch-lrmd_Makefile_in b/package/pacemaker/patches/patch-lrmd_Makefile_in new file mode 100644 index 000000000..c30d80227 --- /dev/null +++ b/package/pacemaker/patches/patch-lrmd_Makefile_in @@ -0,0 +1,19 @@ +--- pacemaker-1.1.8.orig/lrmd/Makefile.in 2013-02-28 11:07:12.000000000 +0100 ++++ pacemaker-1.1.8/lrmd/Makefile.in 2013-02-28 12:16:59.000000000 +0100 +@@ -455,11 +455,14 @@ lrmdlibdir = $(CRM_DAEMON_DIR) + lrmd_SOURCES = main.c lrmd.c tls_backend.c + lrmd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ + $(top_builddir)/lib/services/libcrmservice.la \ +- $(top_builddir)/lib/lrmd/liblrmd.la \ +- $(top_builddir)/lib/fencing/libstonithd.la ++ $(top_builddir)/lib/pengine/libpe_rules.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ ++ $(top_builddir)/lib/lrmd/liblrmd.la + + lrmd_test_SOURCES = test.c + lrmd_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ ++ $(top_builddir)/lib/pengine/libpe_rules.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ + $(top_builddir)/lib/lrmd/liblrmd.la \ + $(top_builddir)/lib/cib/libcib.la \ + $(top_builddir)/lib/services/libcrmservice.la \ diff --git a/package/pacemaker/patches/patch-mcp_Makefile_in b/package/pacemaker/patches/patch-mcp_Makefile_in new file mode 100644 index 000000000..a3e72277e --- /dev/null +++ b/package/pacemaker/patches/patch-mcp_Makefile_in @@ -0,0 +1,11 @@ +--- pacemaker-1.1.8.orig/mcp/Makefile.in 2013-02-28 11:07:13.000000000 +0100 ++++ pacemaker-1.1.8/mcp/Makefile.in 2013-02-28 11:18:34.000000000 +0100 +@@ -456,7 +456,7 @@ MAINTAINERCLEANFILES = Makefile.in + @BUILD_CS_SUPPORT_TRUE@@HAVE_SYSTEMD_TRUE@systemdunit_DATA = pacemaker.service + @BUILD_CS_SUPPORT_TRUE@noinst_HEADERS = + @BUILD_CS_SUPPORT_TRUE@pacemakerd_SOURCES = pacemaker.c corosync.c +-@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la ++@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la + @BUILD_CS_SUPPORT_TRUE@pacemakerd_LDFLAGS = $(CLUSTERLIBS) + all: all-am + diff --git a/package/pacemaker/patches/patch-tools_Makefile_in b/package/pacemaker/patches/patch-tools_Makefile_in new file mode 100644 index 000000000..36d72e3bd --- /dev/null +++ b/package/pacemaker/patches/patch-tools_Makefile_in @@ -0,0 +1,12 @@ +--- pacemaker-1.1.8.orig/tools/Makefile.in 2013-02-28 11:07:13.000000000 +0100 ++++ pacemaker-1.1.8/tools/Makefile.in 2013-02-28 12:28:59.000000000 +0100 +@@ -570,6 +570,9 @@ INCLUDES = -I$(top_builddir)/include -I$ + COMMONLIBS = \ + $(top_builddir)/lib/common/libcrmcommon.la \ + $(top_builddir)/lib/cib/libcib.la \ ++ $(top_builddir)/lib/pengine/libpe_rules.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ ++ $(top_builddir)/lib/services/libcrmservice.la \ + $(CURSESLIBS) $(CLUSTERLIBS) + + headerdir = $(pkgincludedir)/crm -- cgit v1.2.3