summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/clusterglue/clusterglue.SlackBuild16
-rw-r--r--system/clusterglue/glib-single-include.patch13
2 files changed, 21 insertions, 8 deletions
diff --git a/system/clusterglue/clusterglue.SlackBuild b/system/clusterglue/clusterglue.SlackBuild
index d85c6524ff..b8693fef92 100644
--- a/system/clusterglue/clusterglue.SlackBuild
+++ b/system/clusterglue/clusterglue.SlackBuild
@@ -11,15 +11,13 @@
PRGNAM=clusterglue
VERSION=${VERSION:-5e06b2ddd24b}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -71,6 +69,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Starting with glib 2.32 it is now mandatory to
+# include glib.h instead of individual headers.
+patch -p1 -i $CWD/glib-single-include.patch
+
./autogen.sh
CFLAGS="$SLKCFLAGS" \
@@ -93,13 +95,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
diff --git a/system/clusterglue/glib-single-include.patch b/system/clusterglue/glib-single-include.patch
new file mode 100644
index 0000000000..b5989b103f
--- /dev/null
+++ b/system/clusterglue/glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: Reusable-Cluster-Components-glue--5e06b2ddd24b/include/clplumbing/cl_uuid.h
+===================================================================
+--- Reusable-Cluster-Components-glue--5e06b2ddd24b.orig/include/clplumbing/cl_uuid.h
++++ Reusable-Cluster-Components-glue--5e06b2ddd24b/include/clplumbing/cl_uuid.h
+@@ -16,7 +16,7 @@
+
+ #ifndef _CL_UUID_H_
+ #define _CL_UUID_H_
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ typedef struct cl_uuid_s{
+ unsigned char uuid[16];