From 134e83ca5464dcd7f7e988167e2c20f25dbc2b67 Mon Sep 17 00:00:00 2001
From: Daniel Stodden <daniel.stodden@citrix.com>
Date: Tue, 18 Jan 2011 11:53:23 -0800
Subject: [PATCH] EA-1001: Remove system libaio special build case.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
---
 drivers/Makefile  | 8 --------
 mk/blktap.spec.in | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 484ac75..9c68fe4 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -22,15 +22,7 @@ CFLAGS    += -Wp,-MD,.$(@F).d
 DEPS       = .*.d
 
 tapdisk2 td-util tapdisk-stream tapdisk-diff: LIBS += -L$(LIBVHDDIR) -lvhd -luuid
-
-ifneq ($(USE_SYSTEM_LIBRARIES),y)
-LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
-tapdisk2 tapdisk-stream tapdisk-diff: AIOLIBS := $(LIBAIO_DIR)/libaio.a
-tapdisk2 tapdisk-stream tapdisk-diff: CFLAGS  += -I$(LIBAIO_DIR) -I$(XEN_LIBXC)
-tapdisk2 tapdisk-client tapdisk-stream tapdisk-diff block-log: CFLAGS += -I$(XEN_ROOT)/tools/include
-else
 tapdisk2 tapdisk-stream tapdisk-diff: AIOLIBS := -laio
-endif
 
 ifeq ($(VHD_STATIC),y)
 td-util: CFLAGS += -static
diff --git a/mk/blktap.spec.in b/mk/blktap.spec.in
index 0431318..e6ab0f6 100644
--- a/mk/blktap.spec.in
+++ b/mk/blktap.spec.in
@@ -29,11 +29,11 @@ This package contains the blktap development libraries and header files.
 %patch1 -p1
 
 %build
-%{__make} USE_SYSTEM_LIBRARIES=y KBUILD=/lib/modules/%{uname}/build
+%{__make} KBUILD=/lib/modules/%{uname}/build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install USE_SYSTEM_LIBRARIES=y DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} SBINDIR=%{_sbindir} SYSCONFDIR=%{_sysconfdir}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} SBINDIR=%{_sbindir} SYSCONFDIR=%{_sysconfdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-- 
2.39.5