From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: [PATCH] remove references to removed libflask from
	setup.py
Date: Wed, 08 Feb 2012 14:40:40 +0100
Message-ID: <b730f1f980bdc1edcebf.1328708440@probook.site>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1328707901 -3600
# Node ID b730f1f980bdc1edcebf7dbbbb5253ccafcd8c04
# Parent  3574f4d67843733ccaabab5f8ebb859c99d7314a
remove references to removed libflask from setup.py

Build in SLES11 SP1/2 fails after libflask removal.

> building 'flask' extension
> error: ../../tools/flask/libflask/libflask.so: No such file or directory
> make[3]: *** [install] Error 1
> make[3]: Leaving directory `/usr/src/packages/BUILD/xen-4.2.24701/non-dbg/tools/python'
> make[2]: *** [subdir-install-python] Error 2

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 3574f4d67843 -r b730f1f980bd tools/python/setup.py
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -45,12 +45,10 @@ process = Extension("process",
 
 flask = Extension("flask",
                extra_compile_args = extra_compile_args,
-               include_dirs       = [ PATH_XEN, PATH_LIBXC, "xen/lowlevel/flask",
-                                      "../flask/libflask/include" ],
-               library_dirs       = [ PATH_LIBXC, "../flask/libflask" ],
+               include_dirs       = [ PATH_XEN, PATH_LIBXC, "xen/lowlevel/flask" ],
+               library_dirs       = [ PATH_LIBXC ],
                libraries          = [ "xenctrl" ],
-               depends            = [ PATH_LIBXC + "/libxenctrl.so",
-                                      XEN_ROOT + "/tools/flask/libflask/libflask.so" ],
+               depends            = [ PATH_LIBXC + "/libxenctrl.so" ],
                sources            = [ "xen/lowlevel/flask/flask.c" ])
 
 ptsname = Extension("ptsname",