]> git.pld-linux.org Git - packages/VirtualBox.git/blob - VirtualBox-gcc.patch
- BR: curl-devel
[packages/VirtualBox.git] / VirtualBox-gcc.patch
1 --- configure~  2008-08-04 23:49:45.338189943 +0200
2 +++ configure   2008-08-05 08:45:58.844848232 +0200
3 @@ -334,35 +334,6 @@
4          fail really
5        elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "OS" = "darwin" ]; then
6          log_success "found version $cc_ver"
7 -      elif [ $cc_maj -eq 4 -a $cc_min -eq 3 ]; then
8 -        if [ -z "$CC_COMPAT" ]; then
9 -          log ""
10 -          log "  ** There are known problems with gcc version 4.3 when compiling the recompiler"
11 -          log "  ** stuff. You need to specify a compatibility compiler with version < 4.3. Look"
12 -          log "  ** for a package compat-gcc-34 on Fedora systems or something similar on other"
13 -          log "  ** distributions and call configure with parameter --with-gcc-compat=gcc34."
14 -          fail really
15 -        fi
16 -        if check_avail "$CC_COMPAT" CC_COMPAT really; then
17 -          cc_compat_ver=`$CC_COMPAT -dumpversion` 2>/dev/null
18 -          if [ $? -ne 0 ]; then
19 -            log_failure "cannot execute '$CC_COMPAT -dumpversion'"
20 -            fail really
21 -          fi
22 -          cc_compat_maj=`echo $cc_compat_ver|cut -d. -f1`
23 -          cc_compat_min=`echo $cc_compat_ver|cut -d. -f2`
24 -          if [ $cc_compat_maj -lt 3 \
25 -               -o \( $cc_compat_maj -eq 3 -a $cc_compat_min -lt 2 \) \
26 -               -o \( $cc_compat_maj -eq 4 -a $cc_compat_min -lt 1 \) \
27 -               -o \( $cc_compat_maj -eq 4 -a $cc_compat_min -gt 2 \) \
28 -               -o $cc_compat_maj -gt 4 ]; then
29 -            log ""
30 -            log "  ** Version $cc_compat_ver of the compatibility gcc found. Expected gcc 3.x with x>1"
31 -            log "  ** or gcc 4.x with 0<x<3"
32 -            fail really
33 -          fi
34 -          cnf_append "VBOX_RECOMPILER_OP_GCC" "$CC_COMPAT"
35 -        fi
36        # gcc-4.0 is allowed for Darwin only
37        elif [ $cc_maj -lt 3 \
38               -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
39 --- src/recompiler/Makefile.kmk~        2008-08-05 10:48:06.537032700 +0200
40 +++ src/recompiler/Makefile.kmk 2008-08-05 10:49:59.933687528 +0200
41 @@ -353,9 +353,9 @@
42  
43  
44  # The command sans -o op.S.tmp.
45 -COMPILE_OP_CMDS = $(VBOX_RECOMPILER_OP_GCC) \
46 +COMPILE_OP_CMDS = $(VBOX_RECOMPILER_OP_GCC_PLD_COMPAT) \
47         -S -s \
48 -       $(filter-out -g -O0, \
49 +       $(filter-out -g -O0 -fno-stack-protector, \
50                 $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(KBUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
51                 $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
52                 ) \
This page took 0.031724 seconds and 3 git commands to generate.