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

Collapse All | Expand All

(-)file_not_specified_in_diff (-42 / +27 lines)
Line  Link Here
0
-- /usr/portage/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild       2015-08-09 13:34:49.000000000 -0700                                                           [47/9065]
0
++ virtualbox-guest-additions-5.0.0-r1.ebuild  2015-08-10 11:16:32.899101797 -0700
Lines 43-52 Link Here
43
BUILD_TARGETS="all"
43
BUILD_TARGETS="all"
44
BUILD_TARGET_ARCH="${ARCH}"
44
BUILD_TARGET_ARCH="${ARCH}"
45
MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
46
               vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
47
48
S="${WORKDIR}/${MY_P}"
45
S="${WORKDIR}/${MY_P}"
46
MODULE_NAMES="vboxguest(misc:${S}/out/linux.x86/release/bin/additions/src/vboxguest:${S}/out/linux.x86/release/bin/additions/src/vboxguest)
47
               vboxsf(misc:${S}/out/linux.x86/release/bin/additions/src/vboxsf:${S}/out/linux.x86/release/bin/additions/src/vboxsf)"
48
49
LOCAL_CONFIG_FILE="${S}/LocalConfig.kmk"
50
51
# From the Virtualbox configure script
52
cnf_append() {
53
       printf "%-30s := %s\n" "$1" "$2" >> "${LOCAL_CONFIG_FILE}" || die
54
}
49
pkg_setup() {
55
pkg_setup() {
50
       linux-mod_pkg_setup
56
       linux-mod_pkg_setup
Lines 60-70 Link Here
60
src_unpack() {
66
src_unpack() {
61
       unpack ${A}
67
       unpack ${A}
62
       # Create and unpack a tarball with the sources of the Linux guest
63
       # kernel modules, to include all the needed files
64
       "${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
65
       unpack ./vbox-kmod.tar.gz
66
67
       # Remove shipped binaries (kBuild,yasm), see bug #232775
68
       # Remove shipped binaries (kBuild,yasm), see bug #232775
68
       cd "${S}"
69
       cd "${S}"
69
       rm -rf kBuild/bin tools
70
       rm -rf kBuild/bin tools
Lines 72-107 Link Here
72
src_prepare() {
73
src_prepare() {
73
       # PaX fixes (see bug #298988)
74
       # PaX fixes (see bug #298988)
74
       pushd "${WORKDIR}" &>/dev/null || die
75
       epatch "${FILESDIR}"/vboxguest-5.0.0-r1-log-use-c99.patch
75
       epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
76
       popd &>/dev/null || die
77
       # Disable things unused or splitted into separate ebuilds
76
       # Disable things unused or splitted into separate ebuilds
78
       cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
77
       cnf_append "VBOX_WITH_TESTCASES" ""
79
78
       cnf_append "VBOX_WITH_VALIDATIONKIT" ""
80
       # stupid new header references...
79
       cnf_append "VBOX_WITH_WARNINGS_AS_ERORS" ""
81
       for vboxheader in {product,revision}-generated.h ; do
80
       cnf_append "KBUILD_MESSAGE_STYLE" "brief"
82
               for mdir in vbox{guest,sf} ; do
81
       if ! use X ; then
83
                       ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
82
               cnf_append "VBOX_WITH_X11_ADDITIONS" ""
84
                               "${WORKDIR}/${mdir}/${vboxheader}"
83
       fi
85
               done
86
       done
87
}
84
}
88
src_configure() {
85
src_configure() {
89
       # build the user-space tools, warnings are harmless
86
       # build the user-space tools
90
       local cmd=(
87
       local cmd=(
91
               ./configure
88
               ./configure
92
               --nofatal
89
               --only-additions
93
               --disable-xpcom
90
               --enable-hardening
94
               --disable-sdl-ttf
91
               --disable-opengl # this should not be necessary with VBOX_WITH_X11_ADDITIONS disabled, but eh.
95
               --disable-pulse
92
               --nofatal # warnings are harmless
96
               --disable-alsa
97
               --with-gcc="$(tc-getCC)"
93
               --with-gcc="$(tc-getCC)"
98
               --with-g++="$(tc-getCXX)"
94
               --with-g++="$(tc-getCXX)"
99
               --target-arch=${ARCH}
95
               --target-arch=${ARCH}
100
               --with-linux="${KV_OUT_DIR}"
96
               --with-linux="${KV_OUT_DIR}"
101
               --build-headless
102
       )
97
       )
103
       echo "${cmd[@]}"
98
       echo "${cmd[@]}"
104
       "${cmd[@]}" || die "configure failed"
99
       "${cmd[@]}" || die "configure failed"
Lines 110-129 Link Here
110
}
105
}
111
src_compile() {
106
src_compile() {
112
       for each in /src/VBox/{Runtime,Additions/common} \
107
       cd "${S}" || die
113
               /src/VBox/Additions/linux/sharedfolders ; do
108
       MAKE="kmk" \
114
                       cd "${S}"${each} || die
109
       emake TOOL_YASM_AS=yasm \
115
                       MAKE="kmk" \
110
       KBUILD_VERBOSE=2
116
                       emake TOOL_YASM_AS=yasm \
117
                       KBUILD_VERBOSE=2
118
       done
119
120
       if use X; then
121
               cd "${S}"/src/VBox/Additions/x11/VBoxClient || die
122
               MAKE="kmk" \
123
               emake TOOL_YASM_AS=yasm \
124
               KBUILD_PATH="${S}/kBuild"
125
       fi
126
       # Now creating the kernel modules. We must do this _after_
111
       # Now creating the kernel modules. We must do this _after_
127
       # we compiled the user-space tools as we need two of the
112
       # we compiled the user-space tools as we need two of the

Return to bug 554952