diff options
Diffstat (limited to 'package/cluster-glue')
-rw-r--r-- | package/cluster-glue/Makefile | 49 | ||||
-rw-r--r-- | package/cluster-glue/patches/patch-configure | 11 | ||||
-rw-r--r-- | package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in | 20 | ||||
-rw-r--r-- | package/cluster-glue/patches/patch-lib_stonith_Makefile_in | 18 | ||||
-rw-r--r-- | package/cluster-glue/patches/patch-logd_Makefile_in | 20 | ||||
-rw-r--r-- | package/cluster-glue/patches/patch-lrm_admin_Makefile_in | 11 | ||||
-rw-r--r-- | package/cluster-glue/patches/patch-lrm_test_Makefile_in | 11 |
7 files changed, 0 insertions, 140 deletions
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile deleted file mode 100644 index f66c89909..000000000 --- a/package/cluster-glue/Makefile +++ /dev/null @@ -1,49 +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:= cluster-glue -PKG_VERSION:= 1.0.11 -PKG_RELEASE:= 1 -PKG_MD5SUM:= bd5a20fc9185da17caf113776d1eac47 -PKG_DESCR:= Cluster Glue library and tools -PKG_SECTION:= ha -PKG_BUILDDEP:= glib bzip2 e2fsprogs libaio -PKG_DEPENDS:= libaio -PKG_URL:= http://www.linux-ha.org/wiki/Cluster_Glue -PKG_SITES:= http://openadk.org/distfiles/ -PKG_NOPARALLEL:= 1 - -PKG_LIBC_DEPENDS:= glibc musl -PKG_ARCH_DEPENDS:= x86 x86_64 - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,CLUSTER_GLUE,cluster-glue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -# disable honour cflags stuff -XAKE_FLAGS+= GCC_HONOUR_COPTS=s -CONFIGURE_ENV+= ac_cv_path_HELP2MAN='' -CONFIGURE_ARGS+= --disable-bundled-ltdl \ - --enable-fatal-warnings=no - -TARGET_CPPFLAGS+= -DCONFIG_LITTLE_ENDIAN -ifeq (${CPU_ARCH},mips) -TARGET_CPPFLAGS+= -DCONFIG_BIG_ENDIAN -endif -ifeq (${CPU_ARCH},mips64) -TARGET_CPPFLAGS+= -DCONFIG_BIG_ENDIAN -endif -ifeq (${CPU_ARCH},ppc) -TARGET_CPPFLAGS+= -DCONFIG_BIG_ENDIAN -endif - -cluster-glue-install: - $(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat - $(CP) $(WRKINST)/usr/lib/*.so* \ - $(IDIR_CLUSTER_GLUE)/usr/lib - $(CP) $(WRKINST)/usr/lib/heartbeat/* \ - $(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cluster-glue/patches/patch-configure b/package/cluster-glue/patches/patch-configure deleted file mode 100644 index 4e90d47e7..000000000 --- a/package/cluster-glue/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- cluster-glue-1.0.7.orig/configure 2011-05-24 14:40:32.000000000 +0200 -+++ cluster-glue-1.0.7/configure 2011-06-22 13:30:10.976951778 +0200 -@@ -12620,7 +12620,7 @@ case $libdir in - *prefix*|NONE) - { $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/cluster-glue/patches/patch-lib_clplumbing_Makefile_in b/package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in deleted file mode 100644 index 203ebc6b1..000000000 --- a/package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- cluster-glue-1.0.11.orig/lib/clplumbing/Makefile.in 2013-02-27 15:20:39.000000000 +0100 -+++ cluster-glue-1.0.11/lib/clplumbing/Makefile.in 2013-02-27 15:38:14.000000000 +0100 -@@ -121,6 +121,7 @@ PROGRAMS = $(test_PROGRAMS) - am_base64_md5_test_OBJECTS = base64_md5_test.$(OBJEXT) - base64_md5_test_OBJECTS = $(am_base64_md5_test_OBJECTS) - base64_md5_test_DEPENDENCIES = libplumb.la \ -+ $(top_builddir)/lib/pils/libpils.la \ - $(top_builddir)/replace/libreplace.la - am_ipctest_OBJECTS = ipctest.$(OBJEXT) - ipctest_OBJECTS = $(am_ipctest_OBJECTS) -@@ -454,7 +455,8 @@ ipctransientserver_LDADD = libplumb.la $ - #netstring_test_SOURCES = netstring_test.c - #netstring_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la libhbclient.la $(gliblib) - base64_md5_test_SOURCES = base64_md5_test.c --base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) -+base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) \ -+ $(top_builddir)/lib/pils/libpils.la - EXTRA_DIST = $(test_SCRIPTS) - all: all-am - diff --git a/package/cluster-glue/patches/patch-lib_stonith_Makefile_in b/package/cluster-glue/patches/patch-lib_stonith_Makefile_in deleted file mode 100644 index d5558f681..000000000 --- a/package/cluster-glue/patches/patch-lib_stonith_Makefile_in +++ /dev/null @@ -1,18 +0,0 @@ ---- cluster-glue-1.0.11.orig/lib/stonith/Makefile.in 2013-02-27 15:20:40.000000000 +0100 -+++ cluster-glue-1.0.11/lib/stonith/Makefile.in 2013-02-27 15:39:57.000000000 +0100 -@@ -111,6 +111,7 @@ meatclient_DEPENDENCIES = - am_sbd_OBJECTS = sbd-sbd-md.$(OBJEXT) sbd-sbd-common.$(OBJEXT) - sbd_OBJECTS = $(am_sbd_OBJECTS) - sbd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \ -+ $(top_builddir)/lib/pils/libpils.la \ - $(top_builddir)/lib/clplumbing/libplumbgpl.la - sbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(sbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -385,6 +386,7 @@ sbd_SOURCES = sbd-md.c sbd-common.c - sbd_CFLAGS = -D_GNU_SOURCE - sbd_LDADD = $(GLIBLIB) -laio \ - $(top_builddir)/lib/clplumbing/libplumb.la \ -+ $(top_builddir)/lib/pils/libpils.la \ - $(top_builddir)/lib/clplumbing/libplumbgpl.la - - lib_LTLIBRARIES = libstonith.la diff --git a/package/cluster-glue/patches/patch-logd_Makefile_in b/package/cluster-glue/patches/patch-logd_Makefile_in deleted file mode 100644 index f159c2941..000000000 --- a/package/cluster-glue/patches/patch-logd_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- cluster-glue-1.0.11.orig/logd/Makefile.in 2013-02-27 15:20:40.000000000 +0100 -+++ cluster-glue-1.0.11/logd/Makefile.in 2013-02-27 15:57:45.000000000 +0100 -@@ -362,14 +362,15 @@ AM_CFLAGS = @CFLAGS@ - initddir = @INITDIR@ - ha_logd_SOURCES = ha_logd.c - ha_logd_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la \ -+ $(top_builddir)/lib/pils/libpils.la \ - $(top_builddir)/lib/clplumbing/libplumbgpl.la - - - # $(top_builddir)/lib/apphb/libapphb.la - ha_logger_SOURCES = ha_logger.c --ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la -+ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(top_builddir)/lib/pils/libpils.la - logtest_SOURCES = logtest.c --logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la -+logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(top_builddir)/lib/pils/libpils.la - initd_SCRIPTS = logd - all: all-am - diff --git a/package/cluster-glue/patches/patch-lrm_admin_Makefile_in b/package/cluster-glue/patches/patch-lrm_admin_Makefile_in deleted file mode 100644 index 3e51b9d66..000000000 --- a/package/cluster-glue/patches/patch-lrm_admin_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- cluster-glue-1.0.11.orig/lrm/admin/Makefile.in 2013-02-27 15:20:40.000000000 +0100 -+++ cluster-glue-1.0.11/lrm/admin/Makefile.in 2013-02-27 15:42:54.000000000 +0100 -@@ -349,7 +349,7 @@ INCLUDES = -I$(top_builddir)/include -I$ - -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl - - halibdir = $(libdir)/@HB_PKG@ --COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) -+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) $(top_builddir)/lib/pils/libpils.la - sbin_SCRIPTS = cibsecret - lrmadmin_SOURCES = lrmadmin.c - lrmadmin_LDFLAGS = $(COMMONLIBS) diff --git a/package/cluster-glue/patches/patch-lrm_test_Makefile_in b/package/cluster-glue/patches/patch-lrm_test_Makefile_in deleted file mode 100644 index 1086c9082..000000000 --- a/package/cluster-glue/patches/patch-lrm_test_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- cluster-glue-1.0.11.orig/lrm/test/Makefile.in 2013-02-27 15:20:41.000000000 +0100 -+++ cluster-glue-1.0.11/lrm/test/Makefile.in 2013-02-27 15:52:00.000000000 +0100 -@@ -401,7 +401,7 @@ SUBDIRS = testcases - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl - --COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) -+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) $(top_builddir)/lib/pils/libpils.la - apitest_SOURCES = apitest.c - apitest_LDFLAGS = $(COMMONLIBS) - apitest_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la |