Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 157987 | Differences between
and this patch

Collapse All | Expand All

(-)configure.orig (-27 / +2 lines)
Lines 15-34 Link Here
15
	    --prefix=PREFIX        where to install things ($prefix)
15
	    --prefix=PREFIX        where to install things ($prefix)
16
	    --with-patched-kernel  don't use external module
16
	    --with-patched-kernel  don't use external module
17
	    --kerneldir=DIR        kernel build directory ($kerneldir)
17
	    --kerneldir=DIR        kernel build directory ($kerneldir)
18
	    --qemu-cc="$qemu_cc"   compiler for qemu (needs gcc3.x) ($qemu_cc)
19
	    --disable-gcc-check    don't insist on gcc-3.x
20
                                   - this will break running without kvm
21
EOF
18
EOF
22
    exit 1
19
    exit 1
23
}
20
}
24
21
25
22
26
# prefer gcc if its version is 3.* ( over a compat-gcc )
27
# do it before parsing command line arguments to enable the user
28
#    to specify a specific gcc he/she likes.
29
if gcc -v 2>&1 | grep -q 'gcc *version *3\.[2-4]\.[0-9]'; then
30
	qemu_cc=gcc
31
fi
32
23
33
while [[ "$1" = -* ]]; do
24
while [[ "$1" = -* ]]; do
34
    opt="$1"; shift
25
    opt="$1"; shift
Lines 47-71 Link Here
47
	--with-patched-kernel)
38
	--with-patched-kernel)
48
	    want_module=
39
	    want_module=
49
	    ;;
40
	    ;;
50
	--qemu-cc)
51
	    qemu_cc="$arg"
52
	    ;;
53
	--disable-gcc-check)
54
	    disable_gcc_check=1
55
	    ;;
56
	--help)
57
	    usage
58
	    ;;
59
	*)
41
	*)
60
	    usage
42
	    usage
61
	    ;;
43
	    ;;
62
    esac
44
    esac
63
done
45
done
64
46
65
if [[ -z "$qemu_cc" ]]; then
66
    echo "$0: cannot locate gcc 3.x. please install it or specify with --qemu-cc"
67
    exit 1
68
fi
69
47
70
libkvm_kerneldir="$kerneldir"
48
libkvm_kerneldir="$kerneldir"
71
if (( want_module )); then
49
if (( want_module )); then
Lines 81-100 Link Here
81
}
59
}
82
60
83
(cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir")
61
(cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir")
84
(cd qemu; ./configure --target-list=$(target_cpu)-softmmu --cc="$qemu_cc" \
62
(cd qemu; ./configure --target-list=$(target_cpu)-kvm \
85
    --disable-kqemu --extra-cflags="-I $PWD/../user" \
63
    --disable-kqemu --extra-cflags="-I $PWD/../user" \
86
    --extra-ldflags="-L $PWD/../user" \
64
    --extra-ldflags="-L $PWD/../user" \
87
    --enable-kvm --kernel-path="$libkvm_kerneldir" \
65
    --enable-kvm --kernel-path="$libkvm_kerneldir" \
88
    --enable-alsa \
66
    --enable-alsa \
89
    ${disable_gcc_check:+"--disable-gcc-check"} \
67
    --disable-gcc-check \
90
    --prefix="$prefix"
68
    --prefix="$prefix"
91
)
69
)
92
70
93
94
95
cat <<EOF > config.mak
71
cat <<EOF > config.mak
96
PREFIX=$prefix
72
PREFIX=$prefix
97
KERNELDIR=$kerneldir
73
KERNELDIR=$kerneldir
98
WANT_MODULE=$want_module
74
WANT_MODULE=$want_module
99
EOF
75
EOF
100

Return to bug 157987