EA-1001: Remove system libaio special build case.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/drivers/Makefile b/drivers/Makefile
index 484ac7515be9795a3141de441b9245f47ef4b2f7..9c68fe4db8392d34441add3d9869d323ce13b373 100644 (file)
--- 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 04313184a525d9cb99571b0b94230b561f798e79..e6ab0f65c5e0b58427ccb6b9c9746710b731869a 100644 (file)
--- 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