From 769059f4f8df8e55c8662069cff20c4a6736e4f2 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 31 Aug 2015 17:45:04 +0100 Subject: [PATCH] use new xen-build-only.git --- qemu-configure-rune | 12 ++++++------ script | 4 ++-- xen-rune | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qemu-configure-rune b/qemu-configure-rune index 74c8eff..9f6c836 100755 --- a/qemu-configure-rune +++ b/qemu-configure-rune @@ -48,15 +48,15 @@ CPPFLAGS="-U__SSE2__" \ # --libdir=/local/scratch/Rump-kernels/prefix-qemu/lib \ # --source-path=. \ # --extra-cflags=" \ -# -I/local/scratch/Rump-kernels/xen.git/tools/../tools/include \ -# -I/local/scratch/Rump-kernels/xen.git/tools/../tools/libxc \ -# -I/local/scratch/Rump-kernels/xen.git/tools/../tools/xenstore \ -# -I/local/scratch/Rump-kernels/xen.git/tools/../tools/xenstore/compat \ +# -I/local/scratch/Rump-kernels/xen-build-only.git/tools/../tools/include \ +# -I/local/scratch/Rump-kernels/xen-build-only.git/tools/../tools/libxc \ +# -I/local/scratch/Rump-kernels/xen-build-only.git/tools/../tools/xenstore \ +# -I/local/scratch/Rump-kernels/xen-build-only.git/tools/../tools/xenstore/compat \ # -I/local/scratch/Rump-kernels/prefix/include \ # " \ # --extra-ldflags=" \ -# -L/local/scratch/Rump-kernels/xen.git/tools/../tools/libxc \ -# -L/local/scratch/Rump-kernels/xen.git/tools/../tools/xenstore \ +# -L/local/scratch/Rump-kernels/xen-build-only.git/tools/../tools/libxc \ +# -L/local/scratch/Rump-kernels/xen-build-only.git/tools/../tools/xenstore \ # -L/local/scratch/Rump-kernels/prefix/lib \ # " \ # --bindir=/local/scratch/Rump-kernels/prefix-qemu/bin \ diff --git a/script b/script index 53395a3..0aa914f 100755 --- a/script +++ b/script @@ -104,12 +104,12 @@ stdmakeinstall # build libxc and libxenstore # run ./configure in toplevel to workaround a bug in Xen's build system # that Paths.mk doesn't get generate if only ./configure in tools -setdir /local/scratch/Rump-kernels/xen.git +setdir /local/scratch/Rump-kernels/xen-build-only.git dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \ /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-configure ./configure \ --prefix=/local/scratch/Rump-kernels/prefix \ --with-xen-dumpdir=/local/scratch/Rump-kernels/prefix/var/lib/xen/dump -setdir /local/scratch/Rump-kernels/xen.git/tools +setdir /local/scratch/Rump-kernels/xen-build-only.git/tools dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \ make V=1 CC=/local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-gcc -j4 CPPFLAGS="-U__SSE2__" stdmakeinstall diff --git a/xen-rune b/xen-rune index 7b3aa3f..d7ede20 100755 --- a/xen-rune +++ b/xen-rune @@ -56,12 +56,12 @@ want () { # build libxc and libxenstore # run ./configure in toplevel to workaround a bug in Xen's build system # that Paths.mk doesn't get generate if only ./configure in tools -setdir /local/scratch/Rump-kernels/xen.git +setdir /local/scratch/Rump-kernels/xen-build-only.git dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \ /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-configure ./configure \ --prefix=/local/scratch/Rump-kernels/prefix \ --with-xen-dumpdir=/local/scratch/Rump-kernels/prefix/var/lib/xen/dump -setdir /local/scratch/Rump-kernels/xen.git/tools +setdir /local/scratch/Rump-kernels/xen-build-only.git/tools dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \ make V=1 CC=/local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-cc -j4 CPPFLAGS="-U__SSE2__" stdmakeinstall -- 2.39.5