aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-04-03 14:50:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-04-03 14:51:01 +0000
commit962a60e41301173ba88bba6a74574f1a6dce0ad6 (patch)
tree0a03dfd6491558cf0dc5abd6d25ca25251ea66ed
parentadde4d1462dd4c0ac39f7856da3e0659434cb03a (diff)
downloadaports-962a60e41301173ba88bba6a74574f1a6dce0ad6.tar.bz2
aports-962a60e41301173ba88bba6a74574f1a6dce0ad6.tar.xz
main/drbd: build fix for musl
-rw-r--r--main/drbd/APKBUILD9
-rw-r--r--main/drbd/bits_per_long.patch20
2 files changed, 29 insertions, 0 deletions
diff --git a/main/drbd/APKBUILD b/main/drbd/APKBUILD
index e4fd22a7f9..a949822dcc 100644
--- a/main/drbd/APKBUILD
+++ b/main/drbd/APKBUILD
@@ -14,6 +14,7 @@ makedepends="$depends_dev"
install=
subpackages="$pkgname-doc $pkgname-pacemaker"
source="http://oss.linbit.com/$pkgname/$pkgbase/$pkgname-$pkgver.tar.gz
+ bits_per_long.patch
$pkgname.initd"
@@ -21,6 +22,11 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
sed -i "s/mv --force/mv -f/" drbd/Makefile || return 1
}
@@ -56,8 +62,11 @@ pacemaker() {
}
md5sums="0c54a69603fa28b41de5fb33e03fd9e8 drbd-8.4.3.tar.gz
+8b289fddf94aff469879f0263ffbb294 bits_per_long.patch
d60b4214a512a5dd450fb298cf421c97 drbd.initd"
sha256sums="abeb09309b77b533b8e738a601d703b338dce6e4d6cf59741e2f0693fbf94527 drbd-8.4.3.tar.gz
+fab540bc721b5f759b33bf8bea04d2b25cf9dc64657483afdfb821dec5b6ee79 bits_per_long.patch
e91440fb27e4824fe171283f605f3f554f60facd903d3dfd304ab54b48676d48 drbd.initd"
sha512sums="cdc90bdd9491fe6d29e3b779d69ba2aac1aacdb336586f1ef414d0a0195d922dbefa8b2d9c4868a2476998a713c893403344a2934c7768ff6f4ba9f13bb7277a drbd-8.4.3.tar.gz
+a567bedd4064da2c74c39174e13ca9920219128e55185311909ced884129d40dfc6f3cac552cbe669c48ce24a2db6c461219df91168e27554eaa45c3765edc71 bits_per_long.patch
200e0203706fe5146ba266b518e6ff6ce61aa2cd2e3ca06cccabadff58df834dd61d700a375a31a2bc382f838f87d44c79b80fa15ade628aee345ee3431ede74 drbd.initd"
diff --git a/main/drbd/bits_per_long.patch b/main/drbd/bits_per_long.patch
new file mode 100644
index 0000000000..7b094817a4
--- /dev/null
+++ b/main/drbd/bits_per_long.patch
@@ -0,0 +1,20 @@
+--- ./user/drbd_endian.h.orig
++++ ./user/drbd_endian.h
+@@ -13,9 +13,16 @@
+
+ #include <stdint.h>
+ #include <endian.h>
++#include <limits.h>
+
+ #ifndef BITS_PER_LONG
+-# define BITS_PER_LONG __WORDSIZE
++# ifdef __WORDSIZE
++# define BITS_PER_LONG __WORDSIZE
++# elif ULONG_MAX == 0xffffffffffffffff
++# define BITS_PER_LONG 64
++# elif ULONG_MAX == 0xffffffff
++# define BITS_PER_LONG 32
++# endif
+ #endif
+
+ /* linux/byteorder/swab.h */