full build on Darwin fixes

5 files changed, 23 insertions, 49 deletions

diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index c22d385ac..b8d0cba91 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -4,20 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		drbd
-PKG_VERSION:=		8.3.10
+PKG_VERSION:=		8.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7d80edc2da10de5bfffe0ca9e9996fed
+PKG_MD5SUM:=		3af0cc49ee0b5005ea108c5ba92aa755
 PKG_DESCR:=		DRBD admin tools
 PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
-PKG_SITES:=		http://oss.linbit.com/drbd/8.3/
+PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRBD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+XAKE_FLAGS+=		GENETLINK_H=$(STAGING_DIR)/usr/include/linux/genetlink.h
 CONFIGURE_ARGS+=	--with-distro=generic \
 			--with-pacemaker \
+			--without-heartbeat \
 			--without-km \
 			--without-xen \
 			--without-udev
diff --git a/package/drbd/patches/patch-configure b/package/drbd/patches/patch-configure
index 67bff21ce..ac69badd6 100644
--- a/package/drbd/patches/patch-configure
+++ b/package/drbd/patches/patch-configure
@@ -1,6 +1,6 @@
---- drbd-8.3.10.orig/configure	2011-01-28 12:17:35.000000000 +0100
-+++ drbd-8.3.10/configure	2011-05-25 12:54:02.000000000 +0200
-@@ -3368,7 +3368,7 @@ fi
+--- drbd-8.4.1.orig/configure	2011-12-20 12:43:14.000000000 +0100
++++ drbd-8.4.1/configure	2012-07-24 23:02:23.000000000 +0200
+@@ -3389,7 +3389,7 @@ fi
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile
index 62f61cab4..753454cd1 100644
--- a/package/drbd/patches/patch-drbd_Makefile
+++ b/package/drbd/patches/patch-drbd_Makefile
@@ -1,19 +1,13 @@
---- drbd-8.3.10.orig/drbd/Makefile	2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/drbd/Makefile	2011-10-23 10:22:50.000000000 +0200
-@@ -65,7 +65,6 @@ else
- 
-   # for some reason some of the commands below only work correctly in bash,
-   # and not in e.g. dash. I'm too lazy to fix it to be compatible.
--  SHELL=/bin/bash
- 
-   DRBDSRC := $(shell pwd)
- 
-@@ -133,7 +132,7 @@ else
+--- drbd-8.4.1.orig/drbd/Makefile	2011-11-17 10:01:55.000000000 +0100
++++ drbd-8.4.1/drbd/Makefile	2012-07-24 23:03:11.000000000 +0200
+@@ -116,8 +116,8 @@ else
+ 	else									\
  		grep return $@ ;						\
  	fi ;									\
- 	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
+-	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
 -	mv --force $@.new $@
-+	mv -f $@.new $@
++	printf "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
++	mv $@.new $@
  
    kbuild: drbd_buildtag.c
  	@rm -f .drbd_kernelrelease*
diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c
index 425a04abe..86dd50121 100644
--- a/package/drbd/patches/patch-drbd_drbd_buildtag_c
+++ b/package/drbd/patches/patch-drbd_drbd_buildtag_c
@@ -1,9 +1,11 @@
---- drbd-8.3.10.orig/drbd/drbd_buildtag.c	2011-01-28 12:17:35.000000000 +0100
-+++ drbd-8.3.10/drbd/drbd_buildtag.c	2011-05-23 17:11:52.000000000 +0200
+--- drbd-8.4.1.orig/drbd/drbd_buildtag.c	2011-12-20 12:43:15.000000000 +0100
++++ drbd-8.4.1/drbd/drbd_buildtag.c	2012-07-24 23:03:27.000000000 +0200
 @@ -3,5 +3,5 @@
  const char *drbd_buildtag(void)
  {
- 	return "GIT-hash: 5c0b0469666682443d4785d90a2c603378f9017b"
--		" build by phil@fat-tyre, 2011-01-28 12:17:35";
-+		" build by wbx@neon, 2011-05-23 17:11:52";
- }
+ 	return "GIT-hash: 91b4c048c1a0e06777b5f65d312b38d47abaea80"
+-		" build by phil@fat-tyre, 2011-12-20 12:43:15";
+-}
++		" build by wbx@neon, 2012-07-24 23:03:27";
++}
+\ No newline at end of file
diff --git a/package/drbd/patches/patch-user_Makefile_in b/package/drbd/patches/patch-user_Makefile_in
deleted file mode 100644
index 9471b2aa0..000000000
--- a/package/drbd/patches/patch-user_Makefile_in
+++ /dev/null
@@ -1,24 +0,0 @@
---- drbd-8.3.10.orig/user/Makefile.in	2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/user/Makefile.in	2011-05-23 17:11:50.000000000 +0200
-@@ -73,7 +73,7 @@ drbd_strings.c: ../drbd/drbd_strings.c
- 	cp $^ $@
- 
- drbdadm: $(drbdadm-obj)
--	$(CC) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^
- 
- drbdadm_scanner.c: drbdadm_scanner.fl drbdadm_parser.h
- 	flex -s -odrbdadm_scanner.c drbdadm_scanner.fl
-@@ -82,10 +82,10 @@ drbdmeta_scanner.c: drbdmeta_scanner.fl 
- 	flex -s -odrbdmeta_scanner.c drbdmeta_scanner.fl
- 
- drbdsetup: $(drbdsetup-obj)
--	$(CC) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^
- 
- drbdmeta: $(drbdmeta-obj)
--	$(CC) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^
- 
- clean:
- 	rm -f drbdadm_scanner.c drbdmeta_scanner.c