Attachment 114955 Details for Bug 156699 – file.diff

[patch] file.diff

file.diff (text/plain), 1.52 KB, created by the_mix_room on 2011-04-28 13:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: the_mix_room

Created: 2011-04-28 13:50:09 UTC

Size: 1.52 KB

patch

obsolete

>*** emulators/virtualbox-ose-additions/Makefile	Thu Apr 21 15:51:54 2011
>--- emulators/virtualbox-ose-additions/Makefile	Thu Apr 28 14:21:07 2011
>***************
>*** 37,43 ****
>  		--disable-alsa --disable-dbus --disable-python \
>  		--build-headless
>  
>! CONFLICTS=	bcc-[0-9]* virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]*
>  
>  OPTIONS=	DEBUG "Build with debugging symbols" off \
>  		X11 "Build with X11 support" on \
>--- 37,44 ----
>  		--disable-alsa --disable-dbus --disable-python \
>  		--build-headless
>  
>! CONFLICTS=	bcc-[0-9]* 
>! CONFLICTS_INSTALL= virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]*
>  
>  OPTIONS=	DEBUG "Build with debugging symbols" off \
>  		X11 "Build with X11 support" on \
>*** emulators/virtualbox-ose/Makefile	Thu Apr 21 15:51:54 2011
>--- emulators/virtualbox-ose/Makefile	Thu Apr 28 14:25:55 2011
>***************
>*** 46,52 ****
>  CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
>  USE_LDCONFIG=	${PREFIX}/lib/virtualbox
>  
>! CONFLICTS=	bcc-[0-9]* virtualbox-ose-devel-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]*
>  
>  VBOXUSER?=	vboxusers
>  VBOXWSUSER?=	vboxusers
>--- 46,53 ----
>  CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
>  USE_LDCONFIG=	${PREFIX}/lib/virtualbox
>  
>! CONFLICTS=	bcc-[0-9]* 
>! CONFLICTS_INSTALL= virtualbox-ose-devel-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]*
>  
>  VBOXUSER?=	vboxusers
>  VBOXWSUSER?=	vboxusers

Actions: View | Diff

Attachments on bug 156699: 114955